diff --git a/Manifest b/Manifest
index ccc0fcd7e561..2ba30a330390 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29475 BLAKE2B 158b779d2ea55b8da3f6381c6c6f8f706bb5b1dd5950a33f6e04b6a8a97e5ca0a5bc0e6fe3df401d0162c02c1c8c0172208b3e97a1dc0662d33dd7dd247904e8 SHA512 809b1d1914410c850e574a1e6a7eb8f1425451b03a37ffad63668ca666352a04e83931d99bea0c631c8a65444c84b5b47a9eb68673d18d3ca2b4d975b80f5cc2
-TIMESTAMP 2020-05-13T19:38:23Z
+MANIFEST Manifest.files.gz 29461 BLAKE2B c8727106fda2dfba670ffe97d72d065510d0256744133e918ab4059f1279a4defc5a68f9670d0a977598b99fd22143fab5424d330b6480cb95579de525f9aa35 SHA512 9eea12bdaf9528ddf799ba75691a1eedd02795a787d4edf0632c5eefe82b4be498a853af0a7ef09f44ec0e5692f730c20bb4e313cd24ff6641eb03aca7665297
+TIMESTAMP 2020-05-15T15:08:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl68TK9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6+sGpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBBqxAArV/gKpPch9rOaNIqgDtyfvureDCd+wdH5eeY88QEsqTmCuf7ihABBNRr
-2MFe9GVb4qMR3TjC3buu9TcaCs+ZGs2v+OXZ8YhA4PbdxJpf65IIaNbPmzwN85wv
-JnxunuctfL8x4zLBeZzo6Z2sEBi1UKetcQzn4ioZRq7TqUONj3QLE6ph1v99UoGq
-TCL1138cFgywINj/AM5itk44SkTsoH3v3K9pKzfJQLQLQmLTawFH8/ZO+Ah3HK07
-fEEg/YJ6yf2yeY+R5TV/twWA60RbSj6k9xFCro0xeH4h44deuWVWTFMOlJH5HcBf
-0hvNJrAwuBpDNWwP9tJFa6ysR/aySaWv69H7dhYwGShzw4AiWRRh6ED6b26BN3Tt
-3wY95T/Y2Ujvj0qEb9tpKkNEOJqJ300lwVFITuGu5uonw0tHrUhU6RWXy+H0fYv1
-tHVDITMGKG3cqbVvK5nRLarM86FasPO36AIJX9f8/Ra1ohqFobxYNpXQYoL5u3vT
-OFK1Pe+VDbIPFEKZ1fXlAkn3DEez3md4TFpA0BZhuzcgBOOHYJ1hJqGHDQcpvOWN
-B3VskslUWQVYJ46yR0k1RNWQ/NF8wyHSMlhK/yOiNSKNcMZyzdzcMjeVKrnWS/+d
-4imt5Ap5KO3HWJpZmOHaHfsujdc0AJCAc+cISvJmMIlpjNMywOE=
-=tdAD
+klCshg/+Lf5fmxiTzshz1n2t4ekbYWZyJheVX7VqeUsYkOYHjwHDfTGdWShfLwi+
+KqPjEXTSG7HhxRGVets/LTKfsTNWjrGmLFxj6MSWXYe9mHtlVENep+VNZsT+jWkr
+pMZ1QdbIF4iTUZALZ4nfk00EKI8121VZBayOtP9QNLRvGEC91Wewg/TymO9wTXh/
+fEJXTyTJ73BnhjvSAZ5ibDZqopKSjXPsOkpV0WXuv1+UVT9KDfMAQHaa0xygyBND
+tvK2F3L79k3U6q42XH4Q+F+A7M50/0sh510EAMDylejDHm2QiWkX/AKk4tXXIXz/
+8GtzR/LK0rdCBABxXl8XOVwbfbd9o2OGzRdgmzV7xfxKPunN8rZJhnNErvQkeh1L
+uw38HZSzC5CzGcflxbpxFdHwVlHb18WxtuOeHZNpghUwhTQgXF6BZKSHbpKdEa5i
+HD/3HPElSfcgNn8oalLmFH+KJQ17NDkKxQT3TWa59b50Fs0iQRt/kpJIOOM1pZCx
+jSGArEdNcm2jew091ZIN1FdAKjrRkZx5+4hfbwB+ghrPR+VWhtt8Qi9h8WTX6ywR
+ftN12QMfb4AFDWxBnUHUOiyxbh2ekVVgSoh6hJC7RVp9V9sP5QeMWW8BxO5LA/hh
+OL6L6IZ28kA0lNxmlCW/jh4RWVeBKpZL/F/2ycHhbagpkY0YIzY=
+=BtsC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8eed862dd37b..a5a9142d1a8f 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 8b3b25b36f47..682138573fc3 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/lxd/Manifest b/acct-group/lxd/Manifest
new file mode 100644
index 000000000000..76d05b165259
--- /dev/null
+++ b/acct-group/lxd/Manifest
@@ -0,0 +1,2 @@
+EBUILD lxd-0.ebuild 188 BLAKE2B d153f470506feb2e2557573bbd0423ba1f14ccf319130834723b2b574c4545995329d6ae8b22df175db173f1edcb28f6088c835d9a650469720a7f305428be11 SHA512 6f9a1c1d2dbff5ca04254fee1584e1cd1c2ea263fb317adf08af8b86ae496343f472967e845ac6ab3556bd1b88b2e215616c2b499e2c3d9d584c5d20a46b9111
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/acct-group/lxd/lxd-0.ebuild b/acct-group/lxd/lxd-0.ebuild
new file mode 100644
index 000000000000..b6ce29937d17
--- /dev/null
+++ b/acct-group/lxd/lxd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=402
+DESCRIPTION="Group for app-emulation/lxd"
diff --git a/acct-group/lxd/metadata.xml b/acct-group/lxd/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/acct-group/lxd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c9876cef3474..c548891bace8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index d5317aeb12e6..f2291afd8afc 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,6 @@
 DIST ansible-2.9.7.tar.gz 14215538 BLAKE2B b3882c359d0e71446c81b4f4592a08447656c22ed70358d7eddf36f4a84811d97f047afcdfd57f67664a130cee5c1231a106fc5b77b52cfab8b1be868ee03f81 SHA512 ce029441bcafdc5b44c9fda69f183d4defea84ead5628164caf87306cb97efec68c11b2cce728e90f28290640c320549486a6b4e823710f638d1d2e7c35675a4
+DIST ansible-2.9.9.tar.gz 14222889 BLAKE2B bcacd9271aa0275cff8090819ee5c2832c7b59a287d976ced7e4dad52b5af85350baa1de30f56fdbb92e237c1dd3a9f6ff86cd1af5cb20167331b3f846649d4a SHA512 327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd
 EBUILD ansible-2.9.7.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
+EBUILD ansible-2.9.9.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.9.ebuild b/app-admin/ansible/ansible-2.9.9.ebuild
new file mode 100644
index 000000000000..8c8b3a948043
--- /dev/null
+++ b/app-admin/ansible/ansible-2.9.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 3b97bcd8b21d..f1d6f13aab8d 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -2,6 +2,8 @@ DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91
 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
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1
+DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.mod 39 BLAKE2B 696da67110d64d679050be21d91a8a6ccd196a4f9990c0e29bc202391852290bbf35ce0dc86a28c01edab0288234b03774e0d1484b8083d3e8017e79aa3ca1a7 SHA512 c68be8303533a91ba5c7d7b228c26a37db09e898d5c05071620779a49007e7b7a40a2f9de6a058ef2756afc9f599367e5e1add6ab31cd0f15184e786c0551b4b
+DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.zip 5168 BLAKE2B 682005c2c1a14084958dd0b0046cf270fccab44b6039c7dbc9268d575442b4884ed7278d11282d21b3ef91cf3101539f5e7a3e3bb00ffb3bbd9f8d8fbbf4caa9 SHA512 1240ae1e2d19804912fd96ea170fb37bc9a67570404bf88c708b2434af9ec50f0cffbd96aeaed571a25201960b3ae7ecb0b96f9959eb03148ae99996c8c48b1f
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod 36 BLAKE2B a276a7a6f741d44088769d7f398dc149179e64f54b3c37a2698f9d6d399af81d3b193e5fc6ffd34f222c9664d3f00ef26f8cab6b319c87b9c0cb327fc499a8a6 SHA512 9f41a508d98b7131e46a5cca2211372985f8bd1ea9bd2327ca46262855593b990f0d76aceae6cc92f30cfd8590d74c77bf99cff870bff88aef422aa20c700d5b
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip 5309 BLAKE2B 9edc07c07aaee14eaaf052da0084d0414011f087aec821dc8d3c51144fcdb04f39eda9912b243e20f26d00ef09a43df6aadc6bcfb30f75e85d692c3eed484eca SHA512 7e655c05f5f86243fd2ddbbb23b1001b8f3134733a9fc45a3f26ecda5dacf8de0dddd5053b92fe9071b67e7b7c0bede38736540fbbc13282b9c08b5bcec00166
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
@@ -152,6 +154,7 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe48775
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
 DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
 DIST gopass-1.9.1.tar.gz 418562 BLAKE2B 9db44fcffd8728763364dfbb508565aa30b6b31ab930d65cc8cf9adcde9c26a6dbca5232c6027eac0316e78957f3fa0f5a10f75d24801b6faec283ab51b67a22 SHA512 a70affc278b5d46582a3362c28f1aff8be4481aae3d07f3b7e200117fc2ac79466c475d558fe5a642b0102a46fc95242334f406deca6ee4abd7d5e9f674451ab
+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-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
@@ -163,4 +166,5 @@ DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 EBUILD gopass-1.8.6-r1.ebuild 1068 BLAKE2B 11cfbbeb943ad9ed42bd9e16ff230d49ff40759e241d6a60ccf57b31a4bf455dfb4ff954e31fbfcf06ce242e5776ddff100b604448eed80986bd63c472680fdc SHA512 f9a71715b209b88157c72591a30f3d385f14d6e3456324a75cdcfc1e9e9e9f795f65482f7b3ec45b9691af88d756fd71646a4bf7e0c4855415843663d9c1e78a
 EBUILD gopass-1.9.1.ebuild 9220 BLAKE2B 4108a361a430f00d8eb80b17fd387688c32c7873ce765bfe09b1d4aa09ef4f0c6171a2898072ef56b2e178d02e442901e465111ac6708488f10b4104cb60e6e1 SHA512 68536d8b90fa584227e7a75981fe0b4f66ca85e5c901b3f0dd4be21bf37e21bfeacfaa93c0523210678400f008fd7c6e464c37d244a79e4b72ba66c6e517036f
+EBUILD gopass-1.9.2.ebuild 9002 BLAKE2B d4a6d8e6ca01e0a7d356d13c3dc09907865d009983a148902ddf051140595c4c051675f6755738896616f28eb38e45413095b5205851d6ba57a2c3c03c0515cf SHA512 8f8f0d5093366279a76fee2f32ff6898d5b33d61b3d098d53958fc2b536be9c560b5f5961430a4b2274d8c83f22f08240dd14484f2c75a6c4f5519502a45a962
 MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
diff --git a/app-admin/gopass/gopass-1.9.2.ebuild b/app-admin/gopass/gopass-1.9.2.ebuild
new file mode 100644
index 000000000000..fb86ff16669d
--- /dev/null
+++ b/app-admin/gopass/gopass-1.9.2.ebuild
@@ -0,0 +1,203 @@
+# 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=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/ProtonMail/go-appdir v1.1.0"
+	"github.com/ProtonMail/go-appdir v1.1.0/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/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/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.2"
+	"github.com/dominikschulz/github-releases v0.0.2/go.mod"
+	"github.com/doronbehar/gocui v0.4.2"
+	"github.com/doronbehar/gocui v0.4.2/go.mod"
+	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05"
+	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.3.0"
+	"github.com/gdamore/tcell v1.3.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/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/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-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/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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/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/lucasb-eyer/go-colorful v1.0.2"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/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.6"
+	"github.com/mattn/go-colorable v0.1.6/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/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/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/muesli/crunchy v0.4.0"
+	"github.com/muesli/crunchy v0.4.0/go.mod"
+	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1"
+	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1/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.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/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/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086"
+	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.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"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
+	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/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-20190626150813-e07cf5db2756/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-20200420163511-1957bb5e6d1f"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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/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"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"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 ~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/salt/Manifest b/app-admin/salt/Manifest
index ad35c90de117..065dbd702e48 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -20,9 +20,11 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2019.2.4.tar.gz 14572556 BLAKE2B a1057baa5ab6c0a07f34ce658a1d5bc644f968600663d28d084eb712b55faaee93b8410d81c4b5324944e6e1f2067ffb102200088832e1b0076fed78c8542ae6 SHA512 9e621cbd78ead1060a2b0c07e7ef02e8c4590360a95c51ac29fa8c1add34f617e4407dd28b67cae3b0fd68b333782185edcf1159edd2db08e8b4e79b6b07a63f
+DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7bdc8d5676bd70f9dd143647c62b63aba2052e7f223041b7dd6859cd923398ad22f9d2d1302b8f18b4c69fe7aafb SHA512 95445dff498bea2bc8e3f32749131302481166c8591f11a5f76a7786c3286cb608049a743bc4878c8fbd4e4d22d4949f243f57f1e53725e7076d39aea5ceea20
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
-EBUILD salt-2019.2.4.ebuild 4781 BLAKE2B 6cf570e03b69347f37852b63058299f9916681b11110fb5b5565bfba70abf9b7061f6e3111b82a83f23ce301f826ba5cdc342af3b2749b04958f0af4921d5fcc SHA512 7c67f237ee3f9851fd56c978685fbb591fa738bbb2f45211eb82721b686e106d137226edd89e22066139c3175115d8f4957f245b7cebee7788ac45ce33e754d6
+DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208
+EBUILD salt-2019.2.5.ebuild 4834 BLAKE2B 71c3b4a2e248f2ce8f3a6264a2a72b6dc2948d01194ab923128225db64edf2e2cf35bb28f4b0a172c4859e30f4dc10b3165af12f71d895f360d9ab94f1e2b926 SHA512 21b6984da017d69f5f25a322c6b64605ff8f57fc9f818c961a3ca7330930742117d97f8d8185262b75ba91df254eb2ef64192f74f3176433bbad9e9dcf6d4483
 EBUILD salt-3000.2-r4.ebuild 6322 BLAKE2B b87e6b61af4393ec76be147f60d8c20f5977efd90b9e3338deacc937b1f5fc2a62cadf5c15399bf9578174e7edf1d776804a8eb3a65a42f423ce9995a4fca957 SHA512 1476b8452edf8bdd5c17ec96caab5eaa03b7f313bf6c18525ea2d20791f79b19cfdb25f7ab091b294c966cd72f3f6ad7a2580f4376a6088688af86c359af38f2
+EBUILD salt-3000.3.ebuild 6323 BLAKE2B 8b051bae3bb397bb25bcfe341730b5c0670ca011fad15f268d9c9b33a27f9fc1c95cad659e797b1d5bca75ad9fd09d3667d7d2d7e43a1880955a70c4f40559d4 SHA512 76d5b24985a68a6c4f67c937a71c3bcbf89407ec9ceb0f40bc92cc8196d53830a3ac4000457dc2a5b9660d59a7d6fed79d646e521bcc6ddc9bb29b172eca130c
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-2019.2.4.ebuild b/app-admin/salt/salt-2019.2.5.ebuild
similarity index 98%
rename from app-admin/salt/salt-2019.2.4.ebuild
rename to app-admin/salt/salt-2019.2.5.ebuild
index c83b74b8830a..d8fbc93eb97c 100644
--- a/app-admin/salt/salt-2019.2.4.ebuild
+++ b/app-admin/salt/salt-2019.2.5.ebuild
@@ -76,6 +76,7 @@ BDEPEND="
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		<dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-3000.3.ebuild b/app-admin/salt/salt-3000.3.ebuild
new file mode 100644
index 000000000000..380351911ba9
--- /dev/null
+++ b/app-admin/salt/salt-3000.3.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3000.1-tests.patch"
+	"${FILESDIR}/salt-3000.2-tests.patch"
+
+	# https://github.com/saltstack/salt/pull/55410
+	"${FILESDIR}/salt-3000.2-py38.patch"
+
+	# https://github.com/saltstack/salt/pull/55900
+	"${FILESDIR}/salt-3000.2-py38-abc.patch"
+
+	# misc py38 fixups
+	"${WORKDIR}/salt-3000.2-py38-misc.patch"
+	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index f3dbe1ff8e26..cef6906cde70 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -21,6 +21,6 @@ DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce994
 EBUILD sysklogd-1.5.1-r1.ebuild 1698 BLAKE2B ea86766e53c00480c5ee34ad978e5abf138e7292ed49ff96d7a46f2fed4294729ba029da780d21c67fb688ebd26d669dabb939718542897563e7287ed22e138f SHA512 39232dbb53a7baa81ee2904bcb24f4626da3d5c1ae8acf9357c1e185f308a844c23f11d751655da6aed3067085e667e2c3392738fa66a36233d477a5f32ccf7a
 EBUILD sysklogd-2.0.3.ebuild 1816 BLAKE2B e76c43c7baa2e932aa8177def561beaaacd4fdc4c5980a489737cedb032662c8ec600bedcb5edd4ffbfe8c34d05b1328b7b0030ef3bafe2f522cf41fe7d86bd0 SHA512 bb9beab5a739c694841b699ce078c160b7b021f2c8ff51dc0daacad9ae776a05f1131358172aa387a1ac321ec2860098dccf9dd83aa4018dd300b02aced9cc1c
 EBUILD sysklogd-2.1.1.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
-EBUILD sysklogd-2.1.2.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
+EBUILD sysklogd-2.1.2.ebuild 2071 BLAKE2B 490b6b4fe2844e4c52d7c61196533b68b61453831bbbdb28db8e678733995345b093c6de9026ad9d8400f9c4f149fc138bd0b4141c956080d292fac3e3bcf132 SHA512 f83b017e1dafb5594143d82f395852b9f2894bd29b0ea31b3e648d5c045c6b691e164be78ad6c7b31712c8cb113b2228edd199404670eca1db936b81d0bc7720
 EBUILD sysklogd-9999.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
 MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index ad19247bad98..e3018251aba4 100644
--- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 7de1752a4777..de57ef52bea6 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,3 +1,578 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip 2156000 BLAKE2B b637b0c50932848e72fca02c604a1cca227e92e5a9c706bed9a1f6a1e561f6f02f9f03ea9a420c12fb5e4b4a635af53f5c68ae9bebca367756fcb645816aadd2 SHA512 c6a5042af61a2617139c9081066086e9f94e49bf083d29a8c8ddca31c2c0d3124a937688571fbde5998c47d0dd9ff44692643117a45875fabc4943d5658f044b
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip 31161655 BLAKE2B 8c07832d9023d7f932e15c51508983f1d539cdc0c67ba3ca65a41e2882ff007f88395298878d8e05ea3d5d9dc6df04849c6b81da0f5e2e151bda93495eb3d640 SHA512 74830cbdcd9ebb8eae4640098d2964cf5dbdaae3cd69eeaa5787ac340a0bde06576d54376595632dbc91a35bfb247d596c93e1511e7f473f458ba0fd8c4530b4
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip 96994 BLAKE2B 7932efd0586b1f4a2a6142815d5bb64c0f88074eb43347b458daa1aab9f7989c192004fe7c27a58d830a847db2884d6bd8bf8e97e5a3c3d2def4e721600177da SHA512 639dd9dd5b670eec05d33224f9f025a67105ce34ba7d3b8cfae7a1fbd947312737d31a6575d839790b3373bd6eb1a6a11e264481c0292c50b6b4f4778855070b
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 38083 BLAKE2B e796f7659059c9bb04caa298c94a318fdcc3e251a4caccf71a973ec957899cf49ada77fa866b1883036aed3942f0887c88ef33b22da1387e55bb2847bfdfe0a4 SHA512 16ccb2211f3acb23181cfaa941e5d757dd975a8491cabb0b083411dc7c431c3230aaa7158c03d7ffd1dcba4535d4ab170a6d110c1b9d91ca2553d665767f53ca
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip 41301 BLAKE2B a4511c2b007ba0d066e7055c16580327b5a18aa2d49d954e300660072232c5e80b7be85b39d690e3a99d21478c507038793b56434b46537afb00288df18a4c16 SHA512 f11a9c09267aae2ec86600e9e6f5c2af6c345c7724f92cc11ba050a50ffefcd78b537c26f2b3bc92bce6b5a80458899d440564294659bcef8e4656f4ab544991
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.mod 256 BLAKE2B a3d6043ccd944a28dafb799df0122c4fb8a0f01ccc342d46c32198d8d3a10ac3466612ef5431a40b19a83ea5280c5563ad0a94a4da1472d5a0812640d00a4b8d SHA512 9572676471e1232439c03bc3be1b71c060117735ecaf42e3bca5fc6a838459d342279470107c8688cf1a1b0865cf873d805d771545fa1bdb28f9cc122f5881cc
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.zip 9359 BLAKE2B 840ec2a263e4e76efb7020900d04e1adde8d76bd30b0c035349b43be28022791046bca9984b6150e5cb390a5d36a46cacabcd93b44241c928c09eee0696a6f64 SHA512 dae57380e2fcb94bdfb3f61ad2df9239e158b38f3811f0bfce5f1ade80abc65525355aff312d0600dcbb450c4ad68193a1ed8903276c87086ef4a4e0f0d4a306
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 17111 BLAKE2B 67e9376554073b3fe82834226831bd7ce92d34c9f75240c3423aa3db4e5ce3cee445bf2df4f0f24a61a4f3823c33fbb92e0986f0e5e6860dfd4f5d157e2c5047 SHA512 50182309e9823fe6a3af86a9beda7ea9a2ffd798cc0d9a97481324a205db8ca50f524ec1b482cd9d8ade987c6e7dcc511c2d6937f31d38195f4b496d42e63bd7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip 8761 BLAKE2B bff49ea7cc3b504f9d69bd3d06184ec123cd5d6f9d25368dbf194114925f343bd7f40874933a64e9ad16c6c887cb02df9764a502bc4b2114528a003c993bac7d SHA512 5d9abd4b8468b2ffb9feb70c9a87d2ca57dad721053759c016ba61034a05b72b5d5539a2def3b7f0dfe0f6caec415b0c5a5ff5a8e329554bbae4d85d61c8bef9
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip 16166 BLAKE2B 506805cb5cfc3a2d4aee18916c7a31ab5c58749335a5c8d4ff56a14fec30a1dd0659fa59602ac679b4cb893271b3424a13fe4bb3fecf5d6260a7cbb5099133a6 SHA512 e5270951b7410810a10dd0dfea3424174903bd9189420e0e7b96a4802f2e5a356bd105c2710595dcea0331566e1c207b1de0899d1bf3f56b3c9ac49de75f3698
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.zip 13425 BLAKE2B bf7774758bdacd841a7fd02d343dcd9eb980e57cb3b6b8e30d266a1d7ba0a722ef6342455a7bca4e7e8ba6e25154f469636b5cf553cc4b793ed8a6c65c03f262 SHA512 a9cb374919e68e157afbffbbf630c455e975a7ebdfb87eed454fbef07899c32a89cd7dfe73de932aaa0bc6b8b1026f84980f9c8098a561e0e14b0f5756d732b4
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod 40 BLAKE2B 2c4dab1793ad76dcad762359fa1f9e45f291c15ed270cc172577dc6d96b04460c3a3be683151c2335198247bf9f79a3d9a1bae8d199f19329ea786058da74eff SHA512 9ce2ed40e6d11dcbce52248086844c68adae61e1269a45658007be947571fea9e94e1b1192a34c80fcdda0f37156fe2756f57b9de5ac2103fb32432db0c256e6
+DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.zip 51522 BLAKE2B ffd378bb46b84b435015e486d24958898158c2be4affd80bf7c23b354487b8e85fcc9df390f38bea898a1baa891660329a4240d6244198f8a1cad721744fbed4 SHA512 8d08e138f0176883261bea1159a1af83d3aac7cc845234f08ef0bd4ac428bafed18aababc0d96bc47d4e7b3bca02ee8323a58c6939aa5e1b43f03c23a15f3664
+DIST github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod 47 BLAKE2B 91859f0f4a7fec349c1a1403a76c651ebf3c56d6f5a62044ab9c87d41f6904c61888e77cc47adc9e8463b69320441a1ad10b5d1e7263b0fc0f6a10ea86a16fc9 SHA512 9d49d01de02c003ba65202b3bcf290afcfd3c301134085697f6bb3ea13a18826dfc0fee5e032b1701d1002151c44bca7db3fa575817864571640c4d4f2bb5732
+DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.mod 30 BLAKE2B f6dfa75b9c11cd126f0d4bb1d000ed8cf2a95df64addb279c1cf647a82de6b817890ca4624cca8e1e26a606b70bfa1a8ee4f17baf47ebd4a0a2ecfb07c735e44 SHA512 91d239b6504a52a8a645270f7f1f5b4519ecac9082f994084a7b5ed4e8c320841449ba45c12333e623cfdc6b63762c96f4ff8839394bd95b72d6ecee5426f02e
+DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.zip 40352 BLAKE2B 224d9bd57810fa8275bf060e72539727b5e648c50dc6df0e1cc4abb2ada8d29ffa6e6b40aeeb7c532e548f0c3a39ab5e81f9b021dc95c7f5b00edcaa4867e2f3 SHA512 ddea1fa6e10625c2418c9fea938d51363a9f08587d493e13d4b0dffabc9a4b168768d231b2ba8328f83294ab4cd870f32f53917be62364915346d90035a226dc
+DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
+DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
+DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod 36 BLAKE2B 4fc95f5e7e11399321c64bb3b97234cb0dfde63e21e7bb174ca916917b66ab9ddb0a972c8b5800802f9a8e7e0a3848f2ed4095467c166727848f4213f942ce05 SHA512 b84b0edbabf81d86e47e159c035e900dfb0a2d640ef0f3eb6cd7c1934a301ef146492fee7742295ee0942f1cd41c175dd059d269b10780d5f11c18e405cce605
+DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod 36 BLAKE2B 4fc95f5e7e11399321c64bb3b97234cb0dfde63e21e7bb174ca916917b66ab9ddb0a972c8b5800802f9a8e7e0a3848f2ed4095467c166727848f4213f942ce05 SHA512 b84b0edbabf81d86e47e159c035e900dfb0a2d640ef0f3eb6cd7c1934a301ef146492fee7742295ee0942f1cd41c175dd059d269b10780d5f11c18e405cce605
+DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip 18038 BLAKE2B e9c3c57cce998ff3230349fa06d098ab7d381c77c9331f97a671cac795afbb561602781e076a2929a0a9df3daf1a9e534ad7c534c2e5297c7aeb1f9346e885ad SHA512 92bc64c2e07506ef24b16ff82b2f8c60d5ad5f66343728488dabebbc4dec62ed290503b322941279af007891abc0a6b278fb916c2675494e21845372b93725a3
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.zip 104685 BLAKE2B 74c7b36e96901f3f244a12d951df3dcb00d0fb7ac76dacb3a192d939de49657f3383044c102acd165921ec8c6be9a00a7093d7babbd165e147e14beb953a568f SHA512 99a869dea0e6525cb26e3f305b8da7f55eaed841174f05f8d1dacf7ec318154b83b0fbf7764b9c46e5803f70867c36c388c9abf95be9b58dbc913dd4f6cca04c
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod 46 BLAKE2B 86188ba06e70b77421a7b156c3a1955d5a5f93dc3ac34d6c93247e5c12cab23d6c2e9f0f3486d91deb4e60df94e5e75cb7575ca32967ea9c8522f66f27831139 SHA512 cd235a247bbbec18565d56a2de766574c7a9d1e40f946d9c93e8b23c7642ac048389ecc57a1fe0a4ecc4724b007a2afe40f032e80f5da7e025931d50eca596cf
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip 11146610 BLAKE2B 09116cf32a74fa0877f9785bc90ce6a3b0ea530de5293362e41802f5049b481b66c4fa394c86cf6c3ec16eb5b94f06e972c5b7465161d5f8cc2431d8bec5460b SHA512 2d5bf35b60550be3333b4b6b6ebd2be052af9e2fd5e043d8b47118cb0a32c8ab35c62b46d9cd5f9f11f22ea333ff9e5ff7a2a0ddd2d80082602015a193db5fb7
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip 625384 BLAKE2B c2166883d25860a9a7efe72a0903c902f890454910379915c3ab0593bb8dbe75d2b188be47b953b77ec19cd6f3c2f66beb9f13c74c9e4a0a7eaf38520d05cefc SHA512 5f9e6f7eb666d0546f9c81ba2c9ea68a0ee7fd9cfdc487ca96ae01662bf65c1afcedb05e9576f8eb14d1084a1e3ecfd0a07e79d64308099120434f83d168c98b
+DIST github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod 50 BLAKE2B 1d6b2c6715998ba5019b26937033c47dac3c2ac19a7cb83285d148392b29a7b9a042bee7394a5c8fea924b0d7f31abb956ec78d70f6a2771aa032265475a579c SHA512 8d037507f9f39cb54356c342a7efab84bb497992bf2fa056aff9739450d4c0255165395f463f5a91b465a0cd92ecc9862f7fdc037797aeea01c2c528549c888d
+DIST github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip 188150 BLAKE2B 44ebf4a7f2148bcf30190342f4c443ea1b370bac9cb81ab09e26deed17e4ebd40f55524b6d63c6ca0e6a6924effc478509ca02805a0f07770c09d06f7b4231c6 SHA512 30dc769646c927b10a2d3d5e122e096b5d7c05785dfa94f0ec06ab13a2fe72af349db749ff90f9ac5adbf0e16e4729ecd0e2cf8208e6d7b80d9f775635d222f1
+DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod 32 BLAKE2B 27655dc3368c5b7ef51ae900cd574a88e92ca8e0e853d1024b1a3adf20262f7299b53f00a74e258c820188ccbdd3d3b8ad29aa305a4ce5daefa5e8a9a5216a3e SHA512 c3fc8ced473a5d21e9eb4b3e491ee3f3aff35962028a1ee79b9ed185107d3af0c5663cbfc4a03310bb479a83547d1f769c535d196e174be351d2cdd488d7cfae
+DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip 28292 BLAKE2B e0484f73bb18dbe9a450ea1e61c56874a185f6b4cf5ed6f9ecec0ef744a4727bac5ea5332eca2c87357d90f7b613e838e3ebe9475e35ac16c20e2123b65c9f4d SHA512 8ce75cbb2f8f7ca69bc0a49ebaf5a137773c502da72cff369b3c776193e5d35e7002ffbaa141578d77b84d47ec52e4d9431d20f1b6dcecdc75a9318955607062
+DIST github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod 33 BLAKE2B 61476295776f61181b3cf0f891ef4d75c378ef10fc13b39f2de8e2dbe15af050a125ac1aa8b7de545a20034cd6493b6753e0f2c1e122d72dff151abda9a3c804 SHA512 beb76a1d746806327172ab8ea18f928a187683b009b37d9038a032ccebd44521c9892d44028110cacb4d130fbf53c1d28a6b3c17e8915d70d643236851122b65
+DIST github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip 56548 BLAKE2B 5feae94f043db57cb00db1ddcb0fd2c76eee2fd56c9e578336c860173fa523b8707eed73e3ab1af12ccb4a94f6e2f5ca13f85884d88c9b401a1da4ef5ba1842a SHA512 adbcccb6b4f876e6555c47fd23f9d4e93d5e39ec6dab869d6186103fd9f073bcb41c9f967fe9de8a56d4625348e902e2f50195ba52719554d803485bff28f8dc
+DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.mod 41 BLAKE2B 7b2d1f7187a6d1d4335dab2107c1f3fae7ff9648116b002666a02b899916912d6b989aae93e8c80237711982651d81e84870304349034dd5e221d7a7d2fefa23 SHA512 ad732f316f45f146f7c1baf44bc7f3a167f1cd80a5494ec19b87400c839e7a326e396424cb72b2b6cb9236cf3d7b32a94a19705dd32ee097ac092d72efc4df5e
+DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.zip 6967 BLAKE2B 2ee0f44fcd16e333f13bbec65f86bb9c6c896d43dd138773b062f3526d3d539d0668ff3b8d9caed47ffebbbf084aebb0c96b2a2aa0885214e71420a0a57cd589 SHA512 7f8cfc5c51311f851204d97c921c49faae77d88c7eb6e3772945c1c9f6358c065fc5ac9401ac2a8172bec67d2e10303d0e2eaa541b57b5c5a12744e8ec88e6a7
+DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod 41 BLAKE2B 92a4fb1da6a0a6a82e47382500de2198757bde5f430888faa91ea3723b0eef0f1fbfd3149b9c957fc0aa251e151e07d86bc412a22533384de0a9deeefb26511f SHA512 33bc2c426426b2fe25911154c63fffb0542943dae982c7e1fc0b054314969b94a470d9e75b5afee5273f7355a3d5400cb6a4c50c48d2b254fa5f3238ed32c18f
+DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod 41 BLAKE2B 92a4fb1da6a0a6a82e47382500de2198757bde5f430888faa91ea3723b0eef0f1fbfd3149b9c957fc0aa251e151e07d86bc412a22533384de0a9deeefb26511f SHA512 33bc2c426426b2fe25911154c63fffb0542943dae982c7e1fc0b054314969b94a470d9e75b5afee5273f7355a3d5400cb6a4c50c48d2b254fa5f3238ed32c18f
+DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip 7971 BLAKE2B 7639cf5cc0146fd3941d24836ca364fe23b4e44fa8d935b12c02886ae7afecfbb6975058637d68450f833af2d94462ec821ec96d6c29870e3bab86cc10672996 SHA512 5961eacf446ee1156f6aab1e21ced4e2f439757320bb2a95dc1e73176bed9e4dab74eb1b443003ea6418f0628c4ddf6078d7312d87c8f5f84d223524061efada
+DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod 44 BLAKE2B 770e15635e43111b74151815d493796982cea2dafa5ac8828de2b12e857d30b108091bb04068d037032d8e42a07ba10dd92fcff6fc78ed4c93a75869a9639c39 SHA512 a1570f4b4c886947f5c747387871a09ba0ef2fd19b7afb702be4e7625d76027ae722dbeb601e85b1eb1698eb490a5f0a38db2ba14d32b6ee96fa83279d010715
+DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip 133293 BLAKE2B 9d62348e8118a4099568f5ffb309d9b83763fe06466d408611279edf1c0412147cd6aeeb8966df2bf7eba4251e9ca5cb62272b6c25e97f0d36e9207b2204e101 SHA512 80fd9f8b561a3caa7198f064892008cb2549e228e48d83440b3a2648426e834d5909c3685e97ae0cf7fccd0efdc489665789b521a2f6501e171c6a69c73bb6e5
+DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.mod 191 BLAKE2B d7b3a69969e42ffa19ebf7c9733bf856cdcad526cc08ac3a223394aed93325faf0a05321c2afaf69d4616c5440bc495c7afa31a4a0a261a8e481ee0a46cc1443 SHA512 6a11bdebf0de4bf63674dd98e3d0ec06ff15704bd5114b48cb1689b8672662a55922275714288d30c2fcbf82638c971ae6f54ab9efeb07e5d4c346aa7c00f89c
+DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.zip 50430 BLAKE2B 16bd26350a8d4cc27c671d24f4b735b9a902d91e6b486f8d91c982a901b6c1fb12cf754f11e448a858c7557ee9d508773290050e61bd5183000ff8381e3fe18c SHA512 70af625414965f96a036d806683e5ec3649540fec8122b71328fec4c6bcade4d321740985b254f21c8542a457b02a23b9f415d0e24a60bab574cf2dd66e8bdad
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip 4164 BLAKE2B 8ad86e9653c8353591245723691c78b07df9bc96b91117e6e1f5905195b5c7f575e9754fa525df773fd7a7de8f2944fc9274d149be318cab2860845f429f2b04 SHA512 b618f2476629bd8deb8a3473a1a67b9aaad52c870e6c395c093a16b1cf60e32050b1a6642b1ef8f6abfe01521456d1b903050dbb8ce7a9c9a10372c878c62149
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod 114 BLAKE2B 174391b10d1b269f1bfc2995955c7a1bd05a961dc18954b3a44e35fd9c1b13514f775795f276e89f8899e3a91f38057ee1246f7d8822d2a677c1a6d3f8ee9912 SHA512 e206e387409636216342dabd4dd0acd21785440c3c0b245cf8894b0a367d7f1c9c2b113e99e668fb11545944ed024743242b9e7e5bda0a0860351f5898272fd4
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.zip 13141499 BLAKE2B ed68fc1e907a3b643174859d734b29b088ab009a527bdd0ebbece7e103dcff2e20f16983e000a3da3a020f76efa5e53ba7cdca9743626fd924933ebbdb94a963 SHA512 515e55c064659c1a9d06ef854b929c56ad7f6b822f932b41bb80b7a098760d1418964a2d77a5437f6d0e95f21639fcbea450fdf9cd7382cfb842857bd4d84b48
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.zip 16027457 BLAKE2B 17fac96604cff1de4f63eaca53107a6eed97ed8bd1387983295590603c7784b473f4b9388662cea1f614663ef4f8bfb2a4f72654070e04bf6f18b88410f762a6 SHA512 bbcfed9c7fc835b7bd2228f0594b9d82d8e0a5299fdc0b4a3a2a53ee2014fb78ff03ef529a128c25ce9ec14fa1d349ae2c9808d0d1700865eed12eae13db6e64
+DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
+DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod 35 BLAKE2B cffc4d93883796250299293231d8ab412161515e4dc1038531dccc53b3a53e4ce63dad27376d730433423c8a26165f44ec9fe8835b644c6f548751321bec8ad7 SHA512 b09dee249fe3328abc4372180964ef265d8db2b6c2676b5d71dd1f04f65e4192315b00a7f5f9f573c193d53c31c0493dcd8d441ea8d3a1d340ed531bb7468ae3
+DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip 10363 BLAKE2B 00106cd55d9f8b6bd6799713be177e95cdc6e549d06a5bc954048d822d246e41ec77c2f87b46a571329356af24ad3af25f8c12ac612e43c0a7f8e7172cad3cb5 SHA512 9ff25645bf0a60fd37839b98171adba445869762b73c1582f939fb924bf8007d02777a95b152e0d706d3a53b3c55e672e369ea0cd0c938d22fbf0dc1c6aac610
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip 19948 BLAKE2B 3f604e82647eb2a4a4c309622080fd07701d032a430999f13da727cc01d455cd3d0e31a7079e0bd833fd17d84a228f9e3f588719c4491ba83e50aa442080acf3 SHA512 e1c0c9251b0c7f05bcfad6f73cab4215cbd550d98065ccf8553dc04a56d7f6153ee70a477230a0e7cd8adc3707c8bfba279676902300537eb056fd912d75b51c
+DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod 46 BLAKE2B 314694b2f3ebfb6ce520a9107468ec388a94c5a667ffc679c3864666232a98435a92b468372695359fd4bc05860ddbc98e1a837bf43fa5e5ce6eaf88da0a8c37 SHA512 194965a0934a42f643a21c9a54a538e63c448314dffe7094b632efeb035a554124e7488645e6277362edcb0ccccab83bf1c57ddd8fa23d23aa1320b5e5e92b64
+DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip 10210 BLAKE2B 8bc8ef109441a34d2771fb28bee2158cb3ec241a3b4f08b225a919e2a569f1c614897024a5347f99ee46c2220e2da4b946eec53eda917b06a71b41c90e3e9722 SHA512 c767f7bcf1c937005f4dd019bb02f770d803a3b8baa0748d8720db9fe2c29d114d075f91761237916df74eed15751e90ac1c1bacabadfa55b4411b87ad5c8dd6
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
+DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod 30 BLAKE2B 28acd3b42d1340d8d698f68c95a7e0cd563e5946e5806288ff0273f9b8123f7980e2e81dc5e137ba0b642043990cc2ab16f834ec23b6347a2913805ae2ff2d3a SHA512 b2edbb00ffd0bb0ca877e262d602a219bd31aa4104757bb53711bb0d47e37305e38c85be5d309844dcada4d24a05bb3c12a49b4411aa4c824acb8a83b452a9a9
+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%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.zip 96300 BLAKE2B d9e4ff7f3b689cd42913da0edddad4860724e757d5ca1e5fec6308103f2dc4251d8f64f8550910935edb57f9a8c73e10b720745775639469118fd5d55eaa946b SHA512 c296db7c49e7a51ac966d48d661c4d1734f319879d539530215dd9ce7415df15c6fb9942a7113e0e1873801b2b557410ba8e1efd622315f512cbc23c18b85ec5
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip 2350671 BLAKE2B a92ca77a13f725d8200c54b38feaa8bb930e3f1bacafe8ba58da87d8a10a2997b3128d169ebe815b44b3e49aff3c5da59aaa844d585974a78ae67c46e2ad868d SHA512 20785f6bc9c10177063825a51a4afec84bd069f1876f5caf633379f1c638467cc94f5a4841d245a95e403d075643b7d975cb487b9b3a8c4800c23c320b917770
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 10848 BLAKE2B 6bafaaca5b1bf59ac01421e1726f48de06015b36217f9f08ac776428a9edf089bc64382b251be8a02ac537366542ab160c028af668316a0a821486e29b012116 SHA512 7ec927cc2547c8307631198f09d32507176af71bbf03e7192025798dfd34eed3a8350cc0c5b388069eb6f426352d0688e3ee4baab9cf78b18176eb7e46bfc09f
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip 109300 BLAKE2B d76af4585d0240852a075ec55fc5a2d139cfde0530fb306893f2d981b0c9d5675eb162fe14bbf51b67f266049795f9e002f4929ee51a5686a59826e0ab4de3c4 SHA512 8e27958a53533d7412defe10e7be2c479c8d147001f4cb0e615a130ac362d604d334e35b43bed92a10f33fe72fbf7609aea46b910f53c2b7f7f15fa1dd088fb3
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.zip 25454 BLAKE2B 9faa435a37b9da461243d1040e45036135259b9f19e7ddb15f4909dd19c2e3e81be14d6aab13413025c68f10624f1d1fb5967f0d6932c69069a492e1afd4d7cd SHA512 8712f5d38a03a64f1cec212e010ca689ed63f6f9344e9a8323aeb3e26f0b414473236176094f90b27f46b37ca29c849b93786927293112d477fd6ee4ca2a04b9
+DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod 35 BLAKE2B 18effbab22ec81323de6616d2177fac8d3d81a02de8fe8cdc427a969e6ca54d5c6c84898598fb0970ac12c4577ad10db1b04715fcaaaa1515ca291b7fc4f289f SHA512 f49d53dcb97d48267dbb282392bfb57a39ca600e4e61bd0483e27573dbe80e60334e3b023a6db6d86d86681a88ea25061d6724d656b1fe8ff5d02bb3edbcff85
+DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip 3006 BLAKE2B 78b6c92a698fe1bc7d870b5219da44e4249b9ec12a31eaf9b438c0a1f421f273cb1b11a40dba55022c90af217c4afed112e5991655b14b2a04991764c117c65f SHA512 5f7eaa50e67ef3ccb02ca7d21eb2660395d08f2c86cb2c45bac07a3fb38d7bb783688c4ed7202ee86312b4efd488defdee2893b80a78bfd1046306c4b787614b
+DIST github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod 429 BLAKE2B 1b89e15ade551911f2cfeb241f1707157c1a0427871f0c4ba0eaf39f04686a6fa2a72f32bc6fbcff7e113a1cd7bb731a1bf321dd4007489e66faf612428e2a97 SHA512 b5b4f0f88fc76c4ebc7d203729b095a969d2417a59a605dc78dd7eca128aeaff5a5f4793ddd9281adec7e65c14f2e1121778012e60bdb10b8ec9f84d9b13e6b6
+DIST github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip 7730 BLAKE2B db4cfc15f34d8ab0ad8ea09c0fb8c993d3b80aa00c233b87646e56c60a9ba1c681baec563f594be7cdf43d0ac9b3342a76679bf723c8716d136891f329387ed6 SHA512 6677a77aa84dfe7406c12c78b629dbccf8503ad6e4246383c6404300af23708aad968ac8ca540ba75a527440db4ad8b199cff4fe03aa3b3a7ba58b3142b5526a
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
+DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip 10264 BLAKE2B a442af353fbe4e06b4d14e992bdf4cae3d92eca6e5015bc0f74a27c2e4f26287524f757d3e69a3c1ab72bda5056214f5bfc6658e7dfed15f9e82af52b41df1ff SHA512 6a52f40f36b24cc255edec25956339b246ebdd0426b5597b62de90a15e6aa89c1ee516966c47dfdafaaa61907b423d78133d13b38172ae167be025e4c6d6da91
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.zip 2638262 BLAKE2B 36e2ee7f35b229e77d6574d45712f6bee214e604cf1be37e0217e5d1eeb68863f8c0e3269bbc17487ee49105bd18d202615ba7f93fb40eee5eed42aad53ca770 SHA512 24c8b22b1cb07fe19e1648894ca9439afd87bab73aa627dd319330aeb5e83eae5a8c4b155f1325dde3b31bf040da6a162b9845c1a11b375aa0b969bde845f055
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.zip 39653 BLAKE2B 9b547d2792e07aa81123297fa72df889d1c4e695dd6376e0930b242361c5cda59d32702481e40b29148fd47df25679a8a1a75f3aa66c75aec6be416a5b5e1749 SHA512 1627f509fd7d9a18a913af9787d043d66dd10e1fc51cad4f9e08306cfbeb8f0d7df023d20f46c31b424ce79e337788df10c37285659db6f1be118a27b6083303
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 85123 BLAKE2B 89a11d5b2c0abea9b2f391dea5fbd539b37f7770623b7e535b60d902a33ce0bd6a79928569542e932f117548eece074843303cb4c0539cc8def54dce7363fa25 SHA512 1bf7c75b83793a806e6e664b987f6a21561be9fc687364a6d4cf9fa104df27826482fee467dd752b19f349de2d8dacc1c390b064ecd4eaa2fde6d74bc10af734
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 70555 BLAKE2B d83b37593eea44bbd11100af9c0c41bc2b55e14d06ef1fae1dce5242bf8cea1574c97a7148e7878385fd4bafbb433aa26fb4fcaa47e766353b2b6c179ddda124 SHA512 3ecebc76ab8e8f3cb65a95065639f3e90b5d722ba1aa564b42104e83ea4bd67af65e52c73a33b9b327b9934553f2c5b7324be8229f2c2e95c495065360a37c54
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.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-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%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.zip 1669798 BLAKE2B bfaef686346be22d778c28dfe59f41ea1021f62ab0fe7e46bbe01034b4bf36ab600b3242f2d81c448200f1110073ad7f7c4f2fde3c4a9ca8425ec522b64c4a80 SHA512 46f02a38ea6aa94fc8df0f1c8e5e04cb25fdb0808ec197d975149a8dcee4250ca26b5438004a7b1d85297d78d76629c33cb1a21d6d585224e9352ebd87f0daff
+DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.mod 36 BLAKE2B 565fd7830e103217512df5132ddd118ee71efb8bb9efe75c30cbb64cf2334586be260ab5c53000d0b554edc78c04e178f21a3783a9ac7800b6df575309d44238 SHA512 62d129cb7d3e56784afc55455ede7fc27a47309646966f31186796b1cc651f7f8f0eeffe64f7109448e9aae2adfc9943bb1f40bf18e3b615a9ecda458b2688b5
+DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.zip 80095 BLAKE2B a7a6e20d2eca38f4990a5efd06a428c0e8d3257ff44730c391563a4baabaa6a29e0482e3f51410f9582763c5689e79aa2bf8cb404904181453e4489aa7ddb725 SHA512 565b97d95f359379c1c04aa67060478e99cd912edd8f368054e60d3fc1ba2786380ab622e379b0e2df670cfb258b97d037ee7c536c30af018aa6f28a92f918f3
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip 165533 BLAKE2B 04307e864994ddb9d843c45b57eb5bcac0c5d13aa18e63da83767803e4c1dda72d0c17070d566f6040bbd561fbe46c97bd2027477bbc23acc8b27fe68d48e4ef SHA512 dc279707dde421e9650071c85d85e5311053b1ade53dbaff95e71f3619b54d91200a8836f342d5bae6a324aa27474329bc93323e13ef8a64f79114159bfb79f2
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 421304 BLAKE2B 4c4754375d5603517ed3c272832b5f15958c17806266bed6582d9996d952e7870cd17b547faa6ca9a1e34c98885641c39554816d24f4ed0edf106c518b16fa52 SHA512 c1e49a03098892179f8fa98aa5873085aa3268e782501e83cef88fa909a05336c61dba5fd7094d49f03fd163169028af661699f63ccd6836a67762d7453da77b
+DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod 337 BLAKE2B 91f4d390615c5b479ef339c74bc9c9a460031103eba8af9e570029068cb1f6dd51d3369290bf31e472bfd426cebb29a193fa7830398660a60b83fda3dace5791 SHA512 8c72241f9497d69f4af2ba25f0a9870888cc877a3c287a7a28e891a5ece956afda06d4792dcba852a87d40910b392c0ada9a9961b55498869d4989aa326bc13f
+DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip 27150 BLAKE2B 0e73c40928d73128501176720c08b4964f124189cdd4d9947b409094ada3f9fe356d1fef86bad5fefc275971a487392f22279c59a78fe3939dd684eb56eea2ac SHA512 552c8e942208b9757b6ee2aaf32d1e52c178afd48e3fdac65bbbc436e9f45ed72ba3b2e5d87d0853788b48b6169e679c514015a5bee009c8d1ec2a9d445d3c7a
+DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod 35 BLAKE2B abe58b21d1d4bfd808722eedf7c5539a14f98cf479cca98e38905373a84b0d230168d22f6cade1576e145585289a01a69597d1158a893db6b8393a203d4b295a SHA512 30a341d9047bc35fa2911b119514c68e9a29ac0b57ab84e820b5a52f968fa7968d662777dbdabf06f96f0a4398339ab4d25c714ab7addb833e5c4d6e938a9fb9
+DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip 4331704 BLAKE2B 28dfc37ee0383d7cbaa5145641a36d63f1700d33c0a7dbe6172547302f6df0f79f5eaa8c5d4dc2838665ddc80594266c965966330cb7a501d53a0dfc6ed875e6 SHA512 78519356b3201b506c561b94946fcdeddfa2aba82fee86d860c3ea151b8aed954ead7e0aec13a0c94e24e13874afb87da7895e1def2153bdf09a8582a377135b
+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-azure-helpers%2F@v%2Fv0.10.0.mod 582 BLAKE2B 2d8283278ff4de7a94eea01e4b2e96c49e2eb0452361a93468c2a511607265dd7a8eb3d698eecb2896fac654102be12b43d2ef12245eaedef92a8ab4c376611e SHA512 0f54eccc2a8e9eafaeeeabd51e0427b31cc7eb828846835affae7149814b86a5b6b4836710e75053baba390c74911286c95bd41c89c7bbf8606b3abc28b94853
+DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.zip 43063 BLAKE2B 4011cc0a3eda61f79bf15e5da9d81b45025e6d6519cc50090687838c76d2c17b8be39fda54b248e061b8bf00d3d3973c8ce32d897606b50b88c98369e8c02438 SHA512 7a5016d906562436a1a8367bdaaa41f624f412dfd5b8839aaef81c202045dd2994b8894a6e5eb28d52f50f2f07526d1b8e50482eca5b548a2097986f51067182
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip 9548 BLAKE2B 42b7838560a999f9e5993ddb0d2c56df785334d7a53a66a1165acfcdad1d61c74711f70963bcc606e8dc20635cef940e1f0f921310bd25731923be21d79d1490 SHA512 ab85daa699ca551b48699cb4e41e449f9ce46bc8921c7aa149b6148499e0b369d60df79de1568119c20cfbed7b2febd7ce2df3800f73315da3357b2a373d7cf4
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
+DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.mod 867 BLAKE2B d0efbc99d605ba60f89c4a2eb7cdf943b8f4da5f0d8e09e45f8e58ea0f492e47308c7e17ac090291ab673f5f32c1f281527d370da55571ea06bf1cb17b6c87c7 SHA512 23b1e033f75e68d59e43f0b1f0f0692f0ad15c7ba8d25326f2805eaf4af5e2a841550007dffba81cfcd8f1a9754fb08b5fec407384b7adb06d62f1321340f555
+DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.zip 143778 BLAKE2B be83f65434a7762b7130492a944b7f7153fe2f5af00ec6fcc3768ae29c4a1aae2a15233a756f4e100847399f45fce4d576a24203cfdcc9904fe4b7814acd22d8 SHA512 f396883fb7fc2e9d10e3ae2d9043b2613350f4ca41f027ab8745ec0fe40e828dcd4443427ab7d5390ce470a12c4b07a867ca58599635df0acbeacfc02f4db816
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.zip 17539 BLAKE2B b90c7a23da87d5082b8a1ec8371a6c19c8d34ecc729211c2d206101ac5b3a1b3e8750cb75e1085a213b3e4a461a8321958ac1378807ee23457467f22db14124e SHA512 512322f2fe5c67e7f4b331babbee61cfd9fffa13e14e2e17297ceb5292a5181d4b4091405b9419bc20d875de7885086877c5a6d4c36a5d0ae4ee999521ae4535
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod 47 BLAKE2B 3806ab2f6eb5f3ae860f62ae6c116a332e7c5a5f4ee3110e68317f0818ec6926130d794ea52882f1858ece1c5d8aeed690338ae8cae4a4ab1e4df7461602f140 SHA512 53e8bf4b7db2447d188559e227c18799b6e8581deecadd94d79fd825c830d9d49ca340a20750bdb61b88552d0e9911cb1fd911a933e8d977c6b9662418ba66c5
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip 22836 BLAKE2B d796cf7e391b6d10f3f9aadefdcd9cffbd871cc795a0f8995cc4bcea81036947267b6d7f8f84d98f75ab6991fc0704798be0757ce0a89e69b3e610aa0a9ff672 SHA512 66460ec64753d16d75300686856f6f11fc3c0033fef106fc82e9b3939560dddb262e3feb227b86453612537803f33a181b1f0c45cc91b4f3ad963ebc9aefa6ea
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip 62571 BLAKE2B 0c4df616e4bc9d352799adbd5ebaa553f1aa6b9eda133724095f6c698bf568125f6db86d908e20c44e35aa588405e0def2a4f0d3a9eccef73530e3aee6597e13 SHA512 8d32ab3e320050ec8bd136aa4507c26c52bf88a47c4523ceecafc91e4351a3a13917433ff0be09abadcc94eb1947e16bafc817e96dff67342e4f936125233570
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
+DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.zip 109526 BLAKE2B fd8e23e076a0a5fee9b66ebc28d6509c536a25bfefc54988f45ace70b2884e2380c54726053317cc5f00ac45b354547ae7883c83a7e9106e5eafa8274dbff6f6 SHA512 517c806ad97412a1dba795eabf5b45df84fc69d75b285de602112a99c15508a6027b3cb32aebb2647e0302099f4f42090fe4f9ac221c52e381fecf57f5074f0d
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip 17464 BLAKE2B 73165072089e8102868ccbdb428c73409c21f793b1ddd1d8b19335b6da1d938e308dfafff8053257c3a81f7d3de3f5c41e3e642dda7996f76b81877c5945d2a0 SHA512 965ff35de08e6050c4e7efa7aabb110a309663f3933e7c236cfc958579783f99314b3c91cc2434bc3381f4909a1577d644f9a064140ea7509dd891a0adca67e4
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip 14906 BLAKE2B fc4a7df96ed503f3fe01d0bdbeac5e1ca6885dc2a5b7b22f0f7c2c7d8b2ca787b3a52a1bfcf082b6082e6fcf836c004c8c15d08a48422b83e9d12db72829f3e2 SHA512 10495832f2b8589ab1faac8140f9fb1b35a207683e214efbc11798583d6bf1479b13492d9f9e02dd7368054ea2a0571f87a5a8ae1e37c82454cae86f26db533a
+DIST github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce6703de524b07be5b9afe0443fc29a5783b21d6128db864da4239805d31eaddb284d33a411fe45971fa4a025d45981bd66b12ddfb404cd1aa21b1c26ed7b199 SHA512 c2e445e29a095bb36b58590a7c523bd9aef840bf4b224898e1f77bcaee8854f8ea9b9bfe338916c564f659300728e257075561830b7576a8d264e55242b3f797
+DIST github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip 7353 BLAKE2B 6725b6cb03bcc3ac7b7486f65b72705f6b484692596e24e7d906eea5d3309c49f10f70e6cbcc9a1c6fce89ae8128589be5d6ff5bb085f52178ff7d9e8949c1fc SHA512 edd845569ce3b01acb55f2c6fcfe77cde8a5496962688c91afb9237c49b17fc7cf4edce822100e7878f97ff77521d8a14e5b7683c2f2d3b03f1e7f1ef0606929
+DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod 45 BLAKE2B f929917e6591c425c0570baeba93a9f29783f8d76ddca583e7ef8741210d4798e6ae0373c19334a60d03417b11524eadf3af98fa452b4ee57f120838e61a6677 SHA512 ead2335e4739698a487b3defdf5f09fd5b43c7b39a7466b588d4057e4140061b38d2e23f4abdcbe1d26b4c2e300dc3a5bd6288e9285d36a8b0986c5020ba8e91
+DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip 19131 BLAKE2B a54390bdac1be49b1d08b1d64289d29219edb64d3fa2ad867d3e992ca2ccf47813a0b5e7a17767ba7c6f8adea2ce1f179c67aebafea3e89ac41cdd4b489bd64f SHA512 5029bf828e02a226e417430bb848096d267c061d6c88d7dc465ccb5b508f2463a7ac070e9ff7e93b38f81acb2118ab7040db11e7ef71e8db2b62e5332ed77f9a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip 136787 BLAKE2B 43f94a4b4ea2088289627886db892f223925a1005f9f5f130d0829f71c263a1a0600d837d8b476d11f0a1d9c2d9047e446fce65a8aee4107adbc0137d4d75681 SHA512 8a0978d3a1ee96bad8d72bd8c6f12d149cb21f0ccfe3ed4321448a02894c99a4b851305c43407f9f6beb598586b157ad6bac6a449841024781562aa11b7d615a
+DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.mod 456 BLAKE2B d7be2023d4410010c276f13d5fe652162c3d9ef556c8e373894d39b69fe156f29ed4936cf89a55a9abc0f37cc5d22e13db9023d59ddf7ec16ee2bacaa64b00e3 SHA512 f08bd718a41cd1c3a820ec900baebe9e5de37d305d6d229a99af946f931bc609a5577c1b1a24783435a7522a0c57670395478bd90e5719caa01ccceef93761eb
+DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.zip 100373 BLAKE2B f636846e6cabc522bf0edcc36e14693378f38a12865d01215d2812c4bd7795391779dbc83f7ad0301a2a3de34156aa06af6b0e8ea3a8dd11d508d468d43ce487 SHA512 53bb81c5b007de05873f21ea198e50b9fbcd198a13f2b29e4b8589c0142959e14f6e54e987081e77d46d9f61a304140f3c2aafc8f5c1b0d0d5b51ee83527d393
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip 131062 BLAKE2B fa5e4a026abb6f9af086a0353a739fcb240e5dc74190cf46f2d2eb26af4641acf71ee26ae7f8577c1618f42c2ec97f62cfdc87a06b62320ba933d493f5bbea85 SHA512 103a752af9ef6fb2746c6aa7b405e3d69b23e072869eca1cfbfa0bbdcc61d4c4c157e4e5e09f89c40807994dd61618cfd00d414cb326e6aa7f44886bd0b47c9a
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod 819 BLAKE2B d92365f486528e4ee8abf0a03ec17a4177ee070de453b1bf02af7eb13a944fe85ba81976a5d61cb3e1fdb422e188ebbe62e5db6435eee56bb81ef8f5d5fafbb1 SHA512 f87d8a710287fc690267862806a9a2c320ad0ad6a3b1e80ce5c0c9f23a2cba416599fe855bd4e852384c885fa8dd92345311e652f19eb2c67984eafe3fba322a
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.mod 819 BLAKE2B b350f3a61b049f663433ca0e8c81d8286b0ee7ab1cae8bc427ca0fa5a58ec36320f865bae4664eeb5f97967faa42b966602c06f27d97b021f6594ee33b78c14b SHA512 43f38c0bd9aa60bef8b7befe6f13eb17727fb46ff97806c4914a107b69b183e55e381d055d4502b838d3819e335fe35c56e8b4356ae5187977611c5dbd3bee3a
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.zip 506189 BLAKE2B 2fe00f838565201360ff7d37aa6beb501ddd18b63a92b398b188e9c7893af43a2db34f634cc84426e57c7a97981cf015eb8f634e0c218a02287c23af6de49beb SHA512 9cf90e319d8e80005e207bb61f3fff34f0b3fa3534ade94f0b85731f9fe8f1f9bce5f2891d6fbece97f409ac09c13b1b8524785c42eacd0ed2482ccc0d6b9615
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.zip 75802 BLAKE2B b3fb61bbc3320c9e45ae5a13ab59dbea15b7c2ead09cdfadcd0d9f57e9cb086bd228b70d655055bf64ee2654bc5198722cf85ad0d39e6ef9a52cdb44661d8865 SHA512 d3ff93e46991144635d29fd6ac46b5922480d4f77b66e741dcf9939f977c1a5f6065303410bd5aaeb6e495cf741ebffca205a89d723e02e31f6d6b9a15f85845
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod 39 BLAKE2B c11742f4aa49d10e9a7acbaf0ace6c42549eae13b5107286dd45432b5f83c45d6b87ec8ce57730f232ea21ddf22bcf28a9f4cdfbfc46f9067df311c34dd44361 SHA512 4fd06e96314b6f8b94b8c73af586a934a6a6e9733111fb9253860ae8e65d190a71be0b902f2c0b3b35141499fda55de3e294c317ca1abc5286c4d6570b22a565
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip 90161 BLAKE2B 901155819b7ac4ac892bb581567e4b8ed014fcd6e4b48451ba4696d27ee39df668727415b887ba297d3194bc9a96df6980351c6f8348be7425bb48b348c5a249 SHA512 c84820d4f452ac15e16b8c9bb48bf2a481d94c5403b9a889e98213ba8be43b79f0afa166645b66625ac95beadc9a22710445f9425219b8b20c3f196ddd3db41d
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod 33 BLAKE2B 2afbed06d8fdb0b51c45d20761df6eb7567fbb6e71bc9c2496118a18fcb317022aec325c46367fa2e043a281b80b0249f3cd6d1f9665b15378426c460dd68297 SHA512 fa1952ff68a6c2b0b16f7eda3fa87aeabf4990c565910c85619f8befe88db3c97a75c3eeb5f7585c0d2a763bd88f63e5b053320ae112e74cf3f92e2721c906f5
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip 767764 BLAKE2B 33221dd6c687d740c5f594684e6e9335b1d8eeb67f752f4fc128cadcf166d603e9415c64a2cb41f00a5df66b5c30c5b75a0f59bc5d4451b57411b6865efa0057 SHA512 0032bb1f29a00c9e91d0e40fea52cb95dc904a6f18d97a1506d6491c5a064fd55470e5bdf57dec540913d3993fddf2ce77b0377c7c41f22088cb6f9244403fde
+DIST github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.mod 505 BLAKE2B 3d62d6caf2e9ef92de89d734382fb47920ad059a7ee854ff7fd9e9dc1179518a457541980db2f59feaa3ce2da6c81906c3d6eb701b837703060437d3b7f42936 SHA512 0dc0f9ea94e6ca6a7e2010ac38c25bf2f3ee64cc96d60782c1f301a382fc380a32dcf1f8e59a87c4b7ebd7a49da8e8d8fee4570f0474000795e008819309b8a3
+DIST github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.zip 51630 BLAKE2B 87371945e5a7e8ea87a3e9748bd3daef005521b496b2ff94c295508fbd34fb3fbba677a445413aa65edee8f9e01863906074dfabef0614880ccce0eadad05dcc SHA512 ecbe8faea33eb032dbad4a82427247169836312c968e9440b18386fb0b5d6c6ca789e94b0664463fa10af701883f42e91ff318dc1381dd9a1073e1abbcbd8c3e
+DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.mod 326 BLAKE2B 9883a7b0e00fa84d549354c0c7d919b8e0a06259475c220e3bb6c37d61919dd10cb7df6b44c6378be209a88a398027453bc727050d0d405014b08e275fea38c4 SHA512 55e47a94e5fcab3d78b934d601d1151491b0b6f6cb0c8bd3bd8d211d5691fd2608dfd8c41c42d7f1cd09fa2ed0b2b5477b24c75d6d34f6ce729636f77a49820a
+DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.zip 33653 BLAKE2B ee7eb2b0a715b2fac8b758666aefb6ddcf01d45411571ca523cca59165a4d65887a2b20c0f624d504be00b4136787f4d3c916f9cc8220ab15317d85282021eaf SHA512 f0e7c10354b6c7285122b313b05613493cfad2a40d3855886bd679bd27800b2ba206de9239859bff9da6ac16a1f3d1029198f5c74f7896394d1312f4d82a6749
+DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.mod 34 BLAKE2B 5d90bddb6c15fe62dcde1fd8d340cefcd59aecd538c4b970309bcecfe1adb2566e811e85eca012ad21d88cdce0447bd8139b40aee69087f45242ee0c79774ed3 SHA512 7f8e66cafe4723848294b06d6254ba9b7b41b6239ac18f1338c8094a037644671f36fd04a2e942783dca54d08c9a740e857a5823bd1435adfcb49792a38a9731
+DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.zip 12479370 BLAKE2B fcd2a5f6e8f5713513bde04c197791f8abfe76f23ff3cb407f574cdd9c79596693f8d1f48814132f0bb391594b2f7ccba916a9a37c8e4318214c276ab2aea318 SHA512 691d3ced283223e2a6b0c5303980232cfec200277696654b980d3a966c1e099d9d849487d0323f86c308db2582efe75bd8d52198f0756f3d823cc989c785a44f
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip 27916 BLAKE2B 03c96600c9cb255c97c2d4f6a51bedf5730509de4746dc32d2970ce772a1d7970734d005a56c188f38f754294a2b336cd0aff65b4291e8e4870f4ce99df065ac SHA512 49efd0e004ef2d630807f4ddf1af45521805d21ea57b1413e8cec7c67c37b6ac2562d21873138009d98bbc530f496c6ab43f6e73c960fe98014e2bfbf897b73e
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
+DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod 35 BLAKE2B 58f9081333c4d484056fc9fbc8be7f41cd1f059a20c2786635176a283c47a1d526fe2b5718fc03832a4879c70b9523c9cc3fa6a3d75081778621911e7123af0c SHA512 cb340ca055291eefd8e3f05764d45dc8f11fc25486e8ecc7f4510ef925d0d6a1b81f29c23aebed0e03beb6bd3bbab45ab9ee9344e9d4cf3f4407c2a7031e2ebd
+DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip 161148 BLAKE2B bfa0b01c4e9fb0b576b1ac3b96d4045591ff9b64c7d6c0626dd1a315eaa270889f5634cefce54bcad390faa6d3e1bdd940ca09304d4fbd38580f17e166ad6e47 SHA512 e56b1ebdebeaa8c48d2ab2a934ea5be6f5622a8d2d64e0d8621d054b64f81fc5239ef95b1a0589505a67303844757be6c98116abfcbb200ca71b297dd5dc4b40
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce388bdfa32846c4eb13a143565cbce8f884e5ac50efb194934d82790f6fabebff4f20ca88dd96b0ac0f1d352b30c51037040d1e4e6bb427960cae67 SHA512 28ccf98d677a0ac08bbc2d8e8c94e5880f2c612e891487c8a4a051b67b9d1ff71fd47eecb357ed2c3f7ea25b6444dd1ead2d9942a45ade8c0927de18cec54060
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868f91729f65d64bbe9dca73ffccbcbb31df9bb30c383d104eae3174551ed24b6dd3048b5e1da16b754d618d4ac5d1ac1f455466e7a8a09f77dd7071b16ae1 SHA512 e3b41d60f9467ab7aaa2f2647deb572d95e5e6582dc15fabbf146d3004cc2e19aff6dc862d7cc33f6ab3d64f38d4f9457ad1e55dda3e176d84be1a9001325708
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod 34 BLAKE2B 478d9f3a5b214f002fcd08abafc3b9738ee5a997c612d017bf40def473be58c81d69489ecf546cae460f2ee38c9489ccb1c3bcbf1c27ca572169425b059c3019 SHA512 535a205c3f8b1d8c1c0cfd13ad5881f0174977c0de81ab5927d5c23c99f067eebc8f5c371530234f9626252f52832c3e8d229ab3c0dd6472bd570ac4464c7e36
+DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016
+DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.mod 36 BLAKE2B 47002df6c177371a992c98e6e821e8ee94926bd256b81470e1d06fcbb48ab7ed843e76e4ef1e23ca40e4238d2a3844b5890649c52ae1cf79e8275e58b52c17c6 SHA512 f634e17321bd57c29ef906f01294b53f3af7a8b4e191c87c61c10520800bdcbc43f57e21bc445008c49f41adaa3dabb0ba61461e416907a2ce6ea5cd78b01bd0
+DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.zip 1332306 BLAKE2B e48d8483acf2ac14f213b1d32d5ca700a90d07a9c5eb115b9573bf842976ced5de0f97001714aa252b4f643326b96fd6c8f4b926420ce463fe31a822f9eb8981 SHA512 813f00c09b94c1b4459604d874967fe00a5ecb971af594b86c7f078202baca441f0927665e29395480aa5f8db51f9674e62fd7fa6919044db6641af9f792aa22
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip 109027 BLAKE2B cdf1ed976d193fcfe3a3e632354605c4ee3caf5313525ebb04f12199036f6a2ed748a3c90c1c1847884670f47d61d94b3704de6e4d591a29b6b28b99c0158e75 SHA512 a3e7d0eedd2b18ca5580819c4983b700f242accfb08293898ef74e8f3ebde28a35a90c9927f90d2103aafbfa7274da3a91d274da6ec0e8cfdb1f8b994a5fd79e
+DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod 33 BLAKE2B 86b48a32cb6fc28be9a4bff7a4bb26476927a721756fbbdbed15c5616fe1a24c923012bb0e7096461a98f3a502cdb0b6629ad7fe271a19a603076647b0509c1e SHA512 57b4b2e6362f8ae9ea2f6051a0759ede6e9ef235b150e612e6851604e6d64878df76b986caa743113ff3c849ba812b072a3f82b9e2f31a06bb07380daf3f109b
+DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod 111 BLAKE2B cc5feebcb8909656facde261e7ce1b4d57be6af1021845409567aa6748d9b53f69a101d7fce3031a8b579266d28c8edbabc6193939c99968387e6ad1ef8827e9 SHA512 11ccbd759b2a4a93296b0904b0059bb8327a7dfc79b603dc01d218fb7beef19e2bc55fc7a7290de833c138a0c254a3289ae58364d2d9441b7a25f480704bec63
+DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod 111 BLAKE2B bea53bdd22d5d5fc097a7fb5ea923b1fe0e5fc18abef971c00f917fa0340295d95f9439a2b4787ccced87c49061e8555619e316c3c32a738e880d9d6fbfef4d6 SHA512 debde42d51813c72b30425ca7bc3073fdd430c84951f1c757732f50b6c99e551b702d55edc03ad36526899f9e69d7e8cab6d9fd059bd11ac16c05a1b2a716912
+DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod 111 BLAKE2B 2591929da90611ec56cffaf63040dc59571aea7f617086ee9272e66370685c1d3ad66b41509252a4b27717a1372e3a52615f88c470a25e8e9600a3da5589baab SHA512 93c961c1636221fadfe33ac5cd35e7e62c12d6cb3665745dd47a3608ee1a305d95e2c6bdb39b086336288a93b969f08e43160f2f8202ffeab238d20694fd9437
+DIST github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip 140757 BLAKE2B 244b9d1690a840bc9311c54e64940bfeaddf2634d32affe160048200e6ef182e399d98ee24b80b6e57986f403156c89f8e3d10ba942b8d7363e67f62d1ef6670 SHA512 15cb298d6bfadf99e1a2313e2923298502f97b3087c9b4aae0c72bf83407c671113f3e9ce988f9cfd9d2799a270c9f84d0eb29d4ea244e940cac662181ca0e45
+DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod 111 BLAKE2B e638065c3ace96da9dd096f3ea519ccdbfe58ba7928d8e4ac944c518e018e1020c1728195a6ef8d7c4429befc8dc8a2a4d38096fad75fc2268b67a9616fed3ad SHA512 4c3322f28173656e62b7cecacb357abbde7aec5c6657581b2519a8a913a3f1ab75d446015a42a8be6c4f3dd8d6e3e0bcaaa2f234738cfb5385e62864399fe0c7
+DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod 111 BLAKE2B 1cc3dbb03800b78de071cb5cb6a7c4e5fd066544959591c31bf819fc30fccc52fb819547ec85cd190c6da2bf8de9caa73dfafa35759a503ad0672d8885295f09 SHA512 b1455a3542da84f26ddbd93fb6c0c683bff5c272be5f3c0eabf6a2082dad7d0a6f2bee00a538ddd06390b126a13b7b5710ce023778788f84b04eb8ac0c07e98f
+DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod 120 BLAKE2B f6155af40edbc708d9bf99a9c4403dd5c75780404099278d2f3b3737843eac0a06518413529999f1387329b93f499fdb5dfb143b6e94a2e737d05e9d067ae35d SHA512 edea2397b688b2b8a16a38ca58bbe99ee9206d799414a503db000d70c7b7ffea6e956553c1ee1bbc81e0349277f111864f725c53762e1e0af20abf1025e80c36
+DIST github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod 39 BLAKE2B 406a71bff60b06230bd1dafd228d27c128e46a18b14db329fda5e3e3dee4eb3c777972ece75e0eb62af751adade4ce0cf2e755126b095fb343d53d67027d297f SHA512 fec059c2ef349c930988a7cda3229239ea79b4ed96433c3ac2c1c904839add88ac0dd71eecee488bf9bfe495aba544609be62ec6c70d7d5fca5dc1ee94035b72
+DIST github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip 44499 BLAKE2B cc42fe20448cd095eec48a2acc587e3fa264803e1cd49ba28becc81a2252cd771bcab3d65d90a8d988cc64f3f26a5b7473b37e6924168f9e76da8fd797693f2a SHA512 dbbcac000691f6967b04fc08ba9e6c11eaf761b8b77205bb306da1097525e62f950ce68c851fd7abe967c0be698bf3957db928df9d9102d288a07038497ef31b
+DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod 38 BLAKE2B d0228217f6928e5e181f254b9d4ceebee6bfd4c4ffa388a2dd18a5b761a41130af97f5725e447feb7fc40169ee017c69a43565a70f3a17c46e56097ab2674b64 SHA512 7c39bf919ec24040eeeec3892f7f5cc2042c09abcc5c6899ebd42d0d8c3c8ccea052ee2afa01d32dae81aabef64da0e831e19033092ea06b69f3077381c6ded2
+DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip 8193 BLAKE2B a603ef11c065eae9b49fe7336fd7dc115392f6384693f598507f0f267190c85725ac175aba71e81c7fd6bf8c03a0e8cb183c4578db2f5e63dbd9adedda63f506 SHA512 7f5d2566bd58c56a4145153ecf667d00ecfcaff0f359b9657279f89d8cc211efcbfb196afcb018cd5b1c53aabfaac40f1a9519f486c5f7371efa8b4b93b547c4
+DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.mod 576 BLAKE2B 886987c87f91c1da62ce9d1698687e49f9bc50f9a1f50eeda2e19e8a951cbfa897e5631550825e8986bc367ef86edfdbc9950a0743762ee838bbe07a3cfd933f SHA512 fa1e280e5b93f647c417109a902e2959668437201e971e942561960462594f153046b32bcaf4c1b7884f6e001e3b2bf791d13e83128337ea34d97668b76ca904
+DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.zip 51831 BLAKE2B a216f66f3055c1dc043e09edafbd71877eda7e12fe244533136268d6af75c41d79110471fd13f81de83fb42f4e52b47ada8df8ef68da6607b0af4f85103e05ad SHA512 77d6e575be7fe2a9b95b8f7765bd5c1bbb559d004b750c6819cef707d029531b4d275bd55b6e3b052bcedffaf6ea3ae84d85816152c50655c08672d9c91aa930
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip 12177 BLAKE2B f0c99c40e021ae1262064909bdbaf9493836fc860e36decf3400d1ffb385d23ed4fbfd476d5c329d74a336b26781cea0b62180420895d3a9811a1d5fa27dac76 SHA512 fb7597c396082e29ccef11a9f78963d850bfe154a400def531e607cad7b3585b1f546de026eebff6ea8bc6d00962dc4610f2d20d4e75c25d7c36915e6831aabc
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.zip 6915 BLAKE2B c635157b3fcfa5f9d990bc2c452c6e038ac5549ec3100b2df80b51271004f75700c9f6144ce2ab61002d7fd6eed4dc02d7928336149c7e59b7be03835873b2e0 SHA512 a11d1e71a13782e0890369c4fd52a1e29b2e8a3ee42ba97ea2b479b0c43c260c37dcc648e1625f1437769dcd0bd07f04ae502f48749745fda22f0fa16328a9eb
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip 6594 BLAKE2B b15e08c63310a36a0c142ad2d04773e9bf0ab3603b39e5252dec6de6b186d1f101f0778c54c931b8a3ff1873afc70d462e0a71b8349eff663ba1a7afb66e4fe6 SHA512 a538577dba9d9b918d9354174ef97507fa8908a48f17a3c0fe97e4215535a6dde8c15f6ec5e807f2445ce6bb80b276d83f21254e58af9a0cafa4ab9013c8d1f0
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip 186888 BLAKE2B bf39f5d488c10729073fc20a8a5f959edd0515c2b6d7178ad898393b74385dbf0ffcd7af30853dce55e4fb1f56c80e78cdc382e8d1d8ed6e77ca268a2c06e0d9 SHA512 57d7b4bba18e5842354223ba6df17d665c207f5aa79daf7ad27b22d99a708e51ab098938df280b19941b94dd02c74468a3b7a5461a26f23e8663017946165fba
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
+DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
+DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
+DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod 42 BLAKE2B 52666cb48d57162787e61dccee8a8958ae7522c5dba51d4ea7665512cefbbb8df3bb8d3bf0aaf67d848476582682ea79c2e79257b304091a8b86add8f2a89d60 SHA512 10b5746e69c90adbf7bc0e0beee112162d6c11c1061362ab86a88b37f028b8a7778e995a0f3298d145ab1d70b86b69900fc36839739e899151d38182d6461fc6
+DIST github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip 4019 BLAKE2B 89d264c4df42022df6eeb0db82de2836b4e433502bd52e55295850f95ef4f8ee9677d2f34baace27345db17e4779a8c575f5c87f2dc3570bf1a951e1845f3e79 SHA512 c32e76e0bdf7d568bca5b6a0095bc14ecfce0af6d0177a649a79e515fed7ea439034f99e0139ade9c0a1349eb323be14bfd115ee457f7cad8c78af287dea3070
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
+DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
+DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
+DIST github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod 47 BLAKE2B 7ba56d388a2d82850868b01f372032ff1653ed029a66c647aa0f82af1cc184686da4057ee3983cafecdccc9d965256bce53b482fae2efd78c85ef6ac09999187 SHA512 9e6c61d5e879ab04661e678bf880f9d95562730074532bc32cd912bfd92b91a081849ce3669f43732c451053189cdbff5583696e4600d75c617a0cf128976e4b
+DIST github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip 9500 BLAKE2B f2076e02b5f9fe386c54f5d1a616209b15a904040328b108676f20bc43431f9cd4dabbac8b9b55901abbf1c352f2b3d01da67c7ec8fa7caa7d3ccf65f93aa57a SHA512 f000d732c54f2970dc1ece6b40dde3a2ce8816211893f42e87a70a92ae3693e35f2f208cf2ee633c67a97e46840d1f5a2a2cfb5adeb1fdbe31bcc1034f772d51
+DIST github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.mod 39 BLAKE2B 9794766a35b319208da77ab4e907a689f608b98ad4d1f8b75dc71064c3d38e7e116ee262fe0dd7645f71ae2850778f496bb874917df8730f19a046f0ac89c9e5 SHA512 d7400258c7225b2be228a8047447c3c12ab3652a54283da8c15451152ce53238a61d201ac77c1719a6b0f12f454c615efef92c3764d90f1a7e207da311c6d883
+DIST github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.zip 4887 BLAKE2B d4fa1345f59e735c7766d83944304c62c798202d5dbbc14f57401516e016be33406e1f78381deb967b232fd097dde42c34211d66fe2f76822bdf37de85a148d9 SHA512 0c1221839ae9e91e973fd0ef808d1183eb3b7e2c4916a5c35aa6eac9a893f18359bf9e722e179f08c4d30e54e105d263dd1b31d40346b2a06453d8ca841f1989
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 7647 BLAKE2B c7fede2886d6150a3e79d73526fc48df4922ebedadfbadb70c4b994d58626b0c7121beeeed6c7d83c1da0d2b98e7e31e7aa46d78638ce2ca834fd84a2a4da9d9 SHA512 41f5065474e14b5df4a5c9752c61231a1d330cb1c1448b3b7a4fdf5971e5511f7445361ad008a5ac7ac5f37633cfc490d7e64e605fd3a306018001e92cedf3b0
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-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%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%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod 42 BLAKE2B e82f069a37fb1b6a6fd2e1db134dead30783798c9a53f981a46ee92e95de0c632e0935ad5dfc0189af152147726bb61ff077860325051fb249b42219d9d26e64 SHA512 f131e8f90d367d342616a13c57c7bb49485e1c3001bf72b02376d8a038a097c292d299e7d0e76111a31f0ef1fd2bf05370eb3f6d1c96f23eca168aaa8ded197c
+DIST github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip 8951 BLAKE2B 54c8c1441934a073eda32baf85adfd0de13cf46eb0ce9a8a27a69ebdd5fc09042f6b1adbab66fc9ec5cc52f64dda996a992e65d7d74416974b4ab36316bbe9c3 SHA512 2c37c05cc0c9ec81756bd41539a6ef6f0673d8fac0df9a9ff58156f0e6a925e097b3b1465234c119ad008765a87fe94e9eda12447dc60515b2d6c6c2fb861a8f
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod 34 BLAKE2B 1e9a31fac4b60a34b6fd680ad3989ba26772d63729017be7166012d7daf1b8a92c4f0b40e91ecc74397d2078534eb9de7a41ede7cc35e89ca03d3a81e7839adb SHA512 5ea9f53329358ce8f981da1eae9827aa484aa159776e1a00bc180833a34a2c9ffddcc1000c81db4018c77ce82108b10815a3d472b396f7312b040534d5eede42
+DIST github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip 5536 BLAKE2B 4aef4f0b7976b684d558a78b210af19968c039430e8444c91be6bdc55dd9728c66678e840f6e89932ea8ce368ff3a1087051e6a9e0f624c5426031b97b5ac6e8 SHA512 8f33d00e767a0209538bc96087cff921f42b710c88e335eeae1fb06a1435bd3f8ba604c629b2d8970510e6dbec7853087be1a957c4ada8fa384dac90f93c823e
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c
+DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.mod 43 BLAKE2B ece3eccf99be110812adcf17b957ee6330c1c490b128a25c1ba6a69f57f0d9efd4c8c030645c750e41f676ab33aab05278149d0875e91010f2dcd1efec08d4df SHA512 10dcc16784bf12ecbdbfd7bc27bc4fd478c4ee09883d80ff8f64b74f0dc92de37366f5bcb81246622110766b693c77e5562519f908ee1453dda84d83afb5ce12
+DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.zip 10489 BLAKE2B af26e3711479d14bbffa351c5fd53c842874ac8e26ad3622b23c3a8eaa2ec04abaf9427ed2cfcc646dc37dc194c30c80e2e811fcb5f715cfa67f0daac3f70a30 SHA512 6c5791f40f2f97ff327c0129d270a6e4486978d12faa5b522fdf65e317b2f7fc635a7cb45774b24274d406fa8b8576e4350020f660bd07e435a5c741b0109d69
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
+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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.mod 86 BLAKE2B 24ac1eb888cf9465e328180c86fdeeb31fdf3227d44469726ea43bf89e9cc807e21ebf365822e60b8f686b215173b834ebb9899052fc4c26ed9aa82eb0e35d25 SHA512 f39d04d0f6037f1dbdc51e01219d2754e52434dc4ad7c2413181b7c51cd9241066ffa61676f55bb994afaacfbea45b62272038c62681eb056522bbe715851b49
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip 24699 BLAKE2B 5e3b644d12a844034ea949a3b0b3471acb29d007fec0f92f07b718733d6dd98af924a8a8f1fbe6825338c1f36b4bd2593b81362aaec347d25f8f9fefa3af3b1c SHA512 a5b0c9ec57a0834c0e80a8dfc820decd89c187fb6392a754292847238d5cc4333b6eb57d823cc1c6796dbccae8c3997833b562cc38f1440e4edab6470bc3ad54
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip 203807 BLAKE2B 38f6971c3cde204ef50304cce44c09a0e8b6f4bfd793a50255edc97fa28358259943fe8892427eefcc74d96aebb2378e655b90247d54e39802f3161a1d9b15ef SHA512 0d5c11527f2c8d41dcc962a3750bc8b6e25acc8e53089c9394744bc85690aa132f961cba7ecd5c7a41b1a8b338b8d6badcf13810ad640900e3fdbd0d4f0e5c31
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.zip 68327 BLAKE2B 9450f4f080ab5390bcd480cbdf8735965e2f67309b39a82febf5cef1186cb5f24e6e7cb5eff4f5b4b2dbfe84d0c41c9e167f92580f5b7e22c36ea9c5e1f29a1e SHA512 c94590036dafeea7cb96d34a1a5db1e5a4d087d164f784d89ddd8d3c5a89326b8d9d78a2862e88ec0abee639d03e210b638640d9754ddd35c357e7ca1a61183d
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip 139422 BLAKE2B 8a7bae0792b45bbc14f152be071b52651c125f64630709bd7539a4a6bebb9a2305a4dc5c39b882190a46699124ca491e5045ec631d0a544c5ec03f1fb00d303e SHA512 83799d97c51ca8f9a557366506ad82a9e1edeee8388ac77f0cf86ccb17f84d99a3e3efabcbb21c31e2eef50a59aa860482900c0dd103b27bdaf141328f830fec
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip 103441 BLAKE2B 0db2c582c9c3b88adfde32eb9fac2bf855daf5392e0ce4b712a12bac78ae1825e2c74d64f69e85430dc2da800f47a8437c3b12531ad0941d2e3ff08e757718a0 SHA512 6e1bbf3b89c135896ca3d0f520bff89a54be03299a2408f81f727fbfe8f933abb11a2e4e2fcebba0dc3fa464fbef2fe8a02f397c9f590c6bcae4053851f0c6af
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip 16598 BLAKE2B a24ac9b6c7787b9593508fb394cfba29c5dcce040cbf7f78891ff521f00773bbcb189c12cd24500510ed6b89a4c906ae7eb6dd0361a3a7c0c964a6819d8aaf27 SHA512 a694940f17372097d987b0585df417a71a5ce9883aed9f5fc1222dfac32d08f804ecae1001a9241ccabe2a4c5bfeea588cedac078afd6ac3188bd4e907376db5
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip 1526595 BLAKE2B 3742d9543c9149072eabfe65841df7b9f684c9eb57c12036d62eb085811e18bddf17cb22a16986c44bfdf14e0ecc0796d423fb3b753ea1433c93ac0bd7f684b6 SHA512 a8ed78675612f30aca890d42154fd6d6f530a991069dcc048e66244bdb4c4345e31a60c4ecfebcd36b5756df7ad4694222d58397a21d704ed5629deac7d24eae
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.zip 68422 BLAKE2B 6a49cd89113a3558267baa933e779eef70de69f4b722005553451c226e66071105b6dcbf491410fa78bacdbd0fa586459f4df5d655ce102b5365aecac731d4af SHA512 8c253cfd9317a6bafd1395c102b1defa5bd67f30171a3d7c85fef05512bad16596c605ff340fe2246b7751600f15d37222c4755e0faa7e5e45d0826791ab9eec
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+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%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod 39 BLAKE2B c3f72de1e0ea9f1bbe083bb8d97a4ba1af19d043aa6509d2d76c4250b9cd595273581e708b09bbc7495618cdb7498071feab530fc5c763a7f1eecb85693d7d21 SHA512 2b5bd6b760b9284457b198c3c0f162a326e75cb3a2937fa0305a9ac3243ed03e65d537795f22a4235265016dc8d4c83138bbd511e4aeafb0f1aaa75cf69020da
+DIST github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip 38488 BLAKE2B 7532c35cd0c74d7afdeb9bf6eba1732c671ac5ec8886d7a4df5f713ceb774f94dab7b203a3d5ff315cfc8ce2cdeaeb12f30e8b5032c016b5bf24d5c2b43be5d6 SHA512 32a14268df16b80f3675222486365449295f31c321713ed86153e061f6182d39d43b970978a820a95ace1cd6cf074a421b5931a8aa7c73ebb81b7c4f601bd264
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip 1055465 BLAKE2B 8eb9d4803d5f2b068d828efc077d655b49d417f22b6acd792d20387d5300b7d5fd04f402b6b129dd1e8f8ddea0dbd1f22a16758312b6d4b4c75d68ee6a625ed9 SHA512 23eab9397742e7005b245b30e0647f2d74a09c5d3626e506535e5cf631c51ba356c75eefe69dfd0d201f8ac5dce81a22626587320f813a573a65728643bedefa
+DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod 261 BLAKE2B 78ddfe52eff9aaaf32470021e4992bafc9afc11d73bc1993fbf29fe5b768457d24d1ae62eaeb97178ea8acf3125ae16c2661a498ece00f2ad182c62ea86ce8c8 SHA512 41e72852cf26bb446a8b0792d777eaaacfac7a1c5604185f892c1a89edf974d538181065d99e38cf1a7b28e232d570c3328c4a97a6ecb3347753791370e35308
+DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip 101665 BLAKE2B 0741fe0249d4b9eceacfb4083cf6eca6fbdc862caa11808f9554f4f5a203d02160703e816f1ff8161e38c9111ca371388571b4a674a60266cfec643c1a46d267 SHA512 4cf5248af38da717c032d78d06a9457ec2a2faa7a1ba15f83f7baeff517eb8f7a2b2f72fb5010f5c608201a5951268f0a9746307699969162470ca95384a0b0e
+DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.mod 67 BLAKE2B 6993090cc14fed97405da3d346e64f06390567aaa99762c4b543b0d1ef975e931c36e08d57281f6671e46dc9dacd857c94aa1515f9c4501c28aa9aadf4d8b9d8 SHA512 ecb8878cb0f4b8b872c7c6a78e830c9ca002b12bdd102fda21e8a461ea6bd01cdcf34dedaf40234282a45be9101e690357d27796675a67f1b4ba4dfc0295cc0c
+DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip 687432 BLAKE2B 736719aa41cae88ecceeb0bb403b1e66549aa13f55c50ad5140a9a4d12ce55f214a3f6d43d270c594cf95b260194fa572c8b8c727c6352063202896870c29d96 SHA512 c2734b7bad81095ad1332210e563b54784c0ab3acc97016f61e253cdbc8189beeff8ba6897573c8ddcec6af528dd1bb7d86b54895dcb34eafcd50f557d3a9357
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip 13531 BLAKE2B 7da23f76d1f6cfdb578c6826a9746381c6227706fdd4658f30bd088883def6662c17d3c06363ea4b9007fad4e7c14b7add0e96380bbe4f5b7feb03125bc830b1 SHA512 6142450cb34a7688845cfeecfff68957118b039d9117ab75584132e34f8ce12ad8ffd24578d1d602c7a98fb2b6b494693ed4e509df2d6130e1d47c5bebcbb420
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod 28 BLAKE2B 4d0512f0c014baf150880e5a0322d1fffc7b726106a54fe1bfe2ce5926081af697f6ce74fe000ddfe18e2e6d44799346272c704644ea4f1fb44232ae02b09725 SHA512 65d5e7c1e6f710fdf6b475ad898c14466064c86e4aed61e44aa23ff699cf3a9a631f255ec298c8b3d7414ba640d8d5117a06386fe2cfa5cee47d183b03ba3bbf
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip 355151 BLAKE2B 845d552a6f36dd795cb634fbfca8b7fb3b70f783bba125827ef11729296621cabcdd1ad5e605f9d6c6148e1dd401efb4c80c7f2de4fe8143e05f7c5dc6e607fc SHA512 1c7d0944948442d15a2befc4d5817883a72b95d9bb0320be569863a64139bb45df5f0a06805f9893de657c6ac78cf6f3e4793d78cd2c674eb1eba86305faee66
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip 508602 BLAKE2B e490d835edcf37e31ae1efc155f0b2e418f78760ff1c3c80d45972abbecff3674c58553b631918bb9477c3d0826321321ff6e5b4a5ca4625fab4c4de12176102 SHA512 e4323f1101acab6d76d312fa969f694f2252568bafd83071ed5db9edc66d097feed8422f7c57db57afb3a00236026f7eea3ddc73ae14eafd4f220b7a1eb3e1da
+DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
+DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
+DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.zip 39554 BLAKE2B 4332cf7c5cc929a3cb7ba9feceb09c337428da161befa8aa4dd68f8b344594f8e973834a012f94c3f0be0d62ec26de4f4d765d4f70f72f8a34d10c95610556af SHA512 33a57ccedd20658c7c616c2a83a9690572714fc461f53f7dad4e737bc97cc79d77c6c122234d38b728149f2f3549521fd4a717352b4820c2953ed6d413d877d8
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip 10353 BLAKE2B 386f5fcd209b8a2f2428e8460dae57d3f5a41649f8a42ba7c5c0f2037fa3b858e949ad3b526d99d71a4f5b094d5b409788dd398a8daacf8e28166be7f290c936 SHA512 8feb5dc97b7c8acbcb7989f7ee6d87b1b3b1074163482438c609418b0dd02135238f80edd968ef7a730aced473d18ea08f5c23ab8b0f7a5e63e76d39d7d8cc96
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.zip 5189 BLAKE2B c33cf849489426ecd3357af65e5e7bffcfe099d68c45533d034c24e7ddf777c8b35906307adf3776dd68066a3d279f524cc34d64357d50b75dbc224ae0bf6b2a SHA512 ced3e4a27e6f88594e9b752950551157b7e0c44f3daecc45582b8c481c3241cc4777fc1e3e75255a888151772a8121c9112830d2cc78d4951500e6b8b96a6118
+DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod 33 BLAKE2B 1fb8495d86422bc87ae3a29d7040d3deb46560e8986404fe66da26fa2f7eea5f38b1ab84a67b8e79c544841627025e882fee2aea3fadd75f69f1761238eac23b SHA512 3f30afa5211772645ee93a8b11eeec246fda17559bb23b1bbc93b614815998fcae1f45827f12922fd8d51bf84425e2154f690728a63b510d278d60a48549fb77
+DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip 8240 BLAKE2B f296b3627e88ad94f61395fd4a7a3622c88747a4314ac1210168554dd63161f214eb6908ee7ee303c7885871265c36b4593891600568e22258e86a5ddb65125e SHA512 14e663d7e0ea19d40586075cfe99b3838c021636d67837f2a128f45ba4ae1a235690c27cdbff12cc76cb632d92bed765ac4cd9e24ef61f138d759988d42c45f7
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod 568 BLAKE2B 12b73afcd7376480c316ad5912040275ee1d9cb69c44df8dee6b66039eed44e3e15bf2f2667e5311ed5de896a87335e1369a6258abf57305640ee9ed94a34c1d SHA512 a5461300e9290c382084daab8f5117d73fbc923d264c7832e8da09e9e768ca93702a858739f26727129482de67ba62078e64bcb04c47aa680383351fba2fe5fb
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod 568 BLAKE2B 12b73afcd7376480c316ad5912040275ee1d9cb69c44df8dee6b66039eed44e3e15bf2f2667e5311ed5de896a87335e1369a6258abf57305640ee9ed94a34c1d SHA512 a5461300e9290c382084daab8f5117d73fbc923d264c7832e8da09e9e768ca93702a858739f26727129482de67ba62078e64bcb04c47aa680383351fba2fe5fb
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.zip 203261 BLAKE2B 0e5507105d38288a2f8a5fa27298469c4c6f82949ff2925572caf6baa34f745e09ca1afb2f5deb36f49d431159b4d60a488a29aba9ea5789ff14a2430c984e34 SHA512 f0b269b9e0eaec6171fbd90c867cf803a2071dba348aed01f7380b87e9438c3c5dfbc39ab503a4bc80b3779c7eb43be81a84da13bfc3eb3de12aa54991177dd5
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.zip 222764 BLAKE2B 3388f9eda2946e53a85f864bd1fcbd79a10ace6d340cece015a94ff05d8585f38528009d535a2e3c3ec135481905ffc1640fdb2c97e0342c9c2c85c39e3c36ed SHA512 37803075932f25cd124481a9eec295cb69881d13b5ad025228cf66cbb8692dd8ef1f6b745b9c264b04984c79d5e9cddc893ca61ba287cb455b87e66822a5dba1
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.zip 223098 BLAKE2B 79609e80b13e36790dd88a2a0c63e74003cb04ca0ae67200daa3cf9e64517fac06dda81c56161728bc7da55c76c9f61410c1640b3eeaca38443853c20724648b SHA512 fc34a477dae8b2f47fe2bf9e25528ffd57832fa737a33aefd4ba9df22ddda9bebeb76dc511f64779f4333c9b02bb4ef446cfe068c39e65b3e7f3a0d0ca53421a
+DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
+DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.zip 68122 BLAKE2B 4b999c18fb98aef02c9248f1c878d844d57ed88aa1e77c81e7d4399172078e50dd4cdfa124a5d6fe9f60a4462c69a25bd2681d0abfc9ac0f6c9962a9df3ac8a0 SHA512 50036e6ed162b1a498062a2601c30e33f833f17a0e3f87a7b12512018e701925311380de89087012a5f72918af0bf6d9d84a84614ba0381353bc81d622551b16
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip 221108 BLAKE2B 9f03d8b356ccff8e8dda9a4885d7fa79eeccb614415b1bc50ec206458f650456a9e1ade1401908b53c37a3b293cd3b7503b84104555250bc801e5c74b8fb9122 SHA512 259b357d0f31ae6ad5dd1b841d69d934b1d9d441617944d4b46269f43fb4de1cbf15750dac9dc87cf4260902ad2f4e4560e6e023375212e554d150fd65af5f9d
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.zip 1424478 BLAKE2B 8c855bc381cd29e62046296d7e94dd75628a7e03b37a5ace2a51af8f49ba565d7ef084cdbd3528d88b8722150be142d6b1f55531b06f3f1b4ede6e8374ef69e7 SHA512 4d93e5adf1b09f1821772034571658bc43b7b330fda25ee7ff52cc0954e481ae0980e199657e96f5943f09d95c2e149307f1efcf7bb0cb834eff7f1259a06a20
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.zip 1817976 BLAKE2B b5b4fc1b562771c9a52c5b2ba34a76520d11cf7876f58e9edbfb288926ae1fe9f560a1e64b7861157dd13a8eefa1face651e8d1705b94ded06019c5ff845ea53 SHA512 ea18bcafe72e397ace410e342ecf19c8d62ea7b9fdf07ec5ee8d6659e41c4c82a9d27c718118aa0df7c5b6f1d8ce45cdc798bcc94c56d559051edda8cc84c5f3
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-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-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip 2727853 BLAKE2B fddbbc97d7f84ee9c80e93815c3893f7cd7ea009ed9199272ad79c5e66d4790748f0b514a7d886fc8a576d751453938f4a61053bc93b05a32dad247f84df4f00 SHA512 2d9d072e62ed56ec47f76ea6e0bbebbdff15ae7fc94782ff1b25e80507a8d2fbc5f9f1bfa630ed816a95f7e64ee764628c24e3f75092691fcaf0b7f09c8ca745
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 13193468 BLAKE2B 26449251871cda35dedc488c3c8c8fc4dc14b1bf79dfa5160b44e6890d5b350111277b1791b18d91a42bd91b6f382baf3caf62584e41c4a928afe17d564e2e6a SHA512 85d4096a7d867d8f4bcc1b3cc582512d94c626023d8abd20ca343009e62b600150076f161f3582ec88c6263695fec0c11de69290a6c6cd04a177272740132be8
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 418135 BLAKE2B d3a64e18959e36aa267f235f1636d00ad545cb32a9245641bd771d511d8168c8070a2e517ae2b65d4d5911c1202267ea8cdd8ea8ed009cec3ccdb9013ad9a0ba SHA512 36a2b9842757e17959c520fe02243502017b8a074da8105763de86ba14c61659f49b3bb8b1eaf8b7c93f2ed297889a26dd43f3f87a139e205390cebb36f2e446
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip 1027160 BLAKE2B 9cc654c2155c5306cbea34e57f9c6e527cd8504278921bb46186c9997a3dd15278a6cda877df9cdac8368a03dd793a071fdc55ab7591cb9d6bd26dcfbed469bd SHA512 8cd3c2d502dbf4955b29e3b0bc5439b7c9ea82c0bdbc2749bd378d5dd30eea81631dffb4aa3306ee4633b0c988f45e73103aeb5ef38d6cc63e6622886456fd06
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+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%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
+DIST terraform-0.12.25.tar.gz 10592286 BLAKE2B c83ba62cded25f279abcb55323137cbbb4e0089ce641136848c235773ec18b8254af3ee761daf0e02be80c507ded26fdae720ec03b80cc8b77000d7ff564ce0f SHA512 875b41987972f7f6e3fea0444a98ba6b033b3a932995693fe047f8751cf556f785a54efd9f53a0ceef598f73df7c6064908fa51824dd8a5b6c3686ba557e9730
 EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
+EBUILD terraform-0.12.25.ebuild 32516 BLAKE2B 82760e733c16dd65dc176500be6e0295b87e466543cea769e48c33398d81abfa880b74ad07d02c470ffcc30a36c20e69b8d8621cb38dae25f55b9b72718ee0de SHA512 a1546571d726307eacfd58f296232718d0ebca2469a956fb21cdccf35abc4376f0f03b02cb60acbc568932b193e356ff8fc59150bb845801c1bd9c06dbe5ad1d
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.25.ebuild b/app-admin/terraform/terraform-0.12.25.ebuild
new file mode 100644
index 000000000000..b0e1ffac3e9b
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.25.ebuild
@@ -0,0 +1,613 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.2"
+	"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292"
+	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6"
+	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.0.1"
+	"github.com/apparentlymart/go-cidr v1.0.1/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171"
+	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.25.3"
+	"github.com/aws/aws-sdk-go v1.25.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.12"
+	"github.com/aws/aws-sdk-go v1.30.12/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/blang/semver v3.5.1+incompatible"
+	"github.com/blang/semver v3.5.1+incompatible/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31"
+	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968"
+	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01"
+	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.4.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.10.0"
+	"github.com/hashicorp/go-azure-helpers v0.10.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f"
+	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26"
+	"github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.3.27"
+	"github.com/hashicorp/go-tfe v0.3.27/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.1.0"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.3.0"
+	"github.com/hashicorp/hcl/v2 v2.3.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
+	"github.com/hashicorp/vault v0.10.4"
+	"github.com/hashicorp/vault v0.10.4/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v1.1.5"
+	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b"
+	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.0.0"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58"
+	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/common v0.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.1"
+	"github.com/spf13/afero v1.2.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/terraform-providers/terraform-provider-openstack v1.15.0"
+	"github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.1"
+	"github.com/zclconf/go-cty v1.2.1/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.1"
+	"github.com/zclconf/go-cty-yaml v1.0.1/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa"
+	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0e7839dede34..48c802caeacc 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index 21366f7259ae..a6f1d4795d2c 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -1,6 +1,7 @@
 AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af159c0e2d8ae6b13d19597611a12a55a983723b0b54f2fde737d6a1538c7757dc4cb2aaf8a6014d4e4a05a836e SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f
 AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
 AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
+AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 833 BLAKE2B 7adb631a3ce1a49a623c1cae337d5cc3e44f08d651769c04e28bc7958134ae2e83e054b894b0b383a2733aa802dd93328a10b50e0cbcc40ba25f4e9a66a4632c SHA512 acc11bc6ddb1775759da2ca4feb370b1c387e922802e398e3a575d86edabe8884878625ab31f6f2906e8e092625c6ce42220cd520d4cf1f58ba44a26740d70b9
+EBUILD arc-5.21p.ebuild 877 BLAKE2B d171ea2003663e9a98391587682fd1f1d49109c895a88747071450ebaa87fcdb2731a9c76a0469c171aaeae7bb9b269717b1bfc5bd79fe4e5f770574a128e2fd SHA512 9eb187ec8f47b773cd795ddcde59a88d5e3bf2e9d5b2ab183e79a800088ef738e591a21605c67372928b3e67b6afa64d29e48d7f9cf027638bd66637405625a1
 MISC metadata.xml 356 BLAKE2B 8f18c0ad0004f2b5a4ad4d35cb420a709bdeaaba374491c58e19ceadc06b6bccdb54419cb4c93985498e9b99b33417d2cecfe26db6228cc500a407e172124f2f SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 93335639d0e0..f62a74e54786 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -18,6 +18,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.21m-darwin.patch
 	"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
 	"${FILESDIR}"/${PN}-5.21o-interix.patch
+	"${FILESDIR}"/${PN}-5.21p-fno-common.patch
 )
 
 src_prepare() {
diff --git a/app-arch/arc/files/arc-5.21p-fno-common.patch b/app-arch/arc/files/arc-5.21p-fno-common.patch
new file mode 100644
index 000000000000..5de65e341c70
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21p-fno-common.patch
@@ -0,0 +1,34 @@
+--- a/arc.h
++++ b/arc.h
+@@ -129,4 +129,8 @@
+ extern u_short	olddate;	/* old archive date stamp */
+ extern u_short	oldtime;	/* old archive time stamp */
+ extern int      dosquash;	/* squash instead of crunch */
++extern long     stdlen;	/* bytes to read */
++extern u_char   *outbuf;
++extern u_char   *outend;
++extern short    crcval;	/* CRC check value */
+ #endif				/* DONT_DEFINE */
+--- a/arclzw.c
++++ b/arclzw.c
+@@ -58,8 +58,7 @@
+ 
+ extern u_char	*pinbuf;
+ u_char		*inbeg, *inend;
+-u_char          *outbuf;
+-u_char          *outbeg, *outend; 
++u_char          *outbeg;
+ 
+ static int      sp;		/* current stack pointer */
+ static int	inflag;
+--- a/arcunp.c
++++ b/arcunp.c
+@@ -39,8 +39,6 @@
+ #define NOHIST 0		/* no relevant history */
+ #define INREP 1			/* sending a repeated value */
+ 
+-short    crcval;		/* CRC check value */
+-long     stdlen;		/* bytes to read */
+ #if	!DOS
+ static int	gotcr;		/* got a carriage return? */
+ #endif
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3499876b9bb2..fbc02ff6ce70 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 364bf991d6a9..e86b92969a1d 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,5 +1,3 @@
-AUX bareos-12.4.5-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed
-AUX bareos-12.4.5-bat-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743
 AUX bareos-cmake-rados.patch 718 BLAKE2B be3c5822a122fb9d6a5bdd6cb388e3edbb59c6e2aafb9e16991bf0c62ab2dbdf0757de88382318bbd9f6b0fb7d48de11c9d0cd6ab276b6fb6c4f61f8b756237a SHA512 46b6ced3bcdf7e6a72029803a60775cfc06b2313004214dfe7d7ffa64f954fb80cb93f7374b967b33b4035aac8fce4412f13833aa57a83e4ce98c503f147918e
 AUX bareos-cmake-symlink-default-db-backend.patch 779 BLAKE2B edb161632215ed8bdc75cae27d54f603787d5f3cbfcf19e180cb7234f661c35527c24dfef38b7c455fd28a46539eae94d157c4777549381c0db64c5fe531d35d SHA512 f5c07d611b7e9f5dc85e0e1440b5bcf43f80a6a6a3b7aead0b88a7a924c9cc8c42bad016d81a0ad55baecc5888e850a516bc86b52a65ddf460c3059fe7f299ee
@@ -15,10 +13,10 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
-DIST bareos-17.2.6.tar.gz 4181984 BLAKE2B a1666b38626228ebf00f6a42f1a5b74c78c26a7178fa5333c9c8fb24ccfda146d20c35d35cbe43b6f53ba1b0ce1dd9b8ad30309997689c39493b51a0db9f5c9b SHA512 5f5ac8cfe028c97fa3120e149f1eb029406b74530517bf6e21574bd726e26c6b78740977635b45cbc2232fda0ee28f1b4338d91a8fa0a86ba05209cce82cd0b2
-DIST bareos-17.2.7.tar.gz 4184028 BLAKE2B dc817ca3b21ea13d9dbd1e3c5691e09bc3adff535e0032e1fbcfff8d07b96b2bf21976f020d778dd16137e51283c2a3dcab78dbe28f7fb6f3a60d43938f6b770 SHA512 254eddacb067ef7e82b7a54bdfcbffd5cfa033fa045f697c7e5b5c28dd064b5e1ce9f6aa946282c60f59972beae0b1b7901882b77c3f71cf16efdd73934135cc
-DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 9fdaf852e748f0c01d06e2fd72351e7b9bf18e8fea92307fb85437441b4ce504f9c6ddbd42cd2185b6dc08158502a7db581bef662c2bd84c86c885d6b89eebba SHA512 b6618173a803db4cfc3fe7edfe8c9e4e4128195f44383cd7df5b9866da4290686ed7cb42499edec957a5d9ab8bbd92d26258ce58f13fba84fb569167956768c3
-EBUILD bareos-17.2.6.ebuild 11114 BLAKE2B 05f45ef2a79e4f950d0a9886bf81d24144bd956d831cf1f1c9d3b306137557987697f10ebc22729154f69ee461b6895a4da7c0f7bceb766addcda2017f336e6f SHA512 469f5ce243207a9edc109a96c9989448415d03a9325a43e9b82fc433a036d5adad3c396c0ce203a775ea4b4a6daeaf83d1a20a64178079cab88ff5d395f7c303
-EBUILD bareos-17.2.7-r1.ebuild 11128 BLAKE2B f6eb077f70294012b46b7443b4305f9ca45c4950814259a98462a4da28957b418557608f39a9b49e15a892b838e78f51ee6c2a836b006d22f6e7e4df32f18ada SHA512 1b4dca43eacadc11d5bc272290f66743cb430a942d3cb9ec4edf66577f3f5c80715008e5b2090e4930ac214dca697ef60ba198e16ab72cead1768441a4585ec6
-EBUILD bareos-18.2.6.ebuild 11998 BLAKE2B 25e45d8312ae7134536c0a23388f7e6285b720f67a283c5def9b701f008cfa744682a61f82a5286205f59c12179b8dd83f920273f65f4a022793eb04141b4f8a SHA512 9fa8945e4713f0f2cbd1726edca024e681dd91c30dcbd56e94351deaeb45c5a6793e0e8cb7075eff27900ee8e98e4287e89133fd63d8bcff4b30e896dfbcbcb2
-MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7
+DIST bareos-17.2.9.tar.gz 4190637 BLAKE2B 266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118 SHA512 ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
+DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2 SHA512 61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
+DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
+EBUILD bareos-17.2.9.ebuild 10551 BLAKE2B df36eaf96f8dbec36101d7dbc736502eaaeca8faf36b0c1dbf7624d031ae0835b5eaad7968ffc94402299ed4d72ebb921e7e16c862b7dd2e67b998a537063308 SHA512 e9052e3e59405361b129e99b163820559e71987b6452fb7936620679f805ba37494bca8bd55bffe45cd7e44958b2559fce3fb50f11cd8f95ce144680ede9a486
+EBUILD bareos-18.2.8.ebuild 11438 BLAKE2B 719291b1a95fe1aa6d602f88c8d71c0a94c7d77bdd0e3313632cb7701d2cb876f072830bcb515a2ef9c39be33b7e843a867510b48b976e51599a889e118b8aea SHA512 1abe95715a635c349c92eda1b695a9e15a5965aeb6eb471591497808c9e51cfd25158b65c98f9677261a7e1c137cf86fe89203296ce6ba7132ec395f36debf7c
+EBUILD bareos-19.2.7.ebuild 10787 BLAKE2B a1672ef75bba19ef60ca8b3392a4213574d8513ce6ceadf6bf8cd0e83e775bea9250e0c2f5aef3045018c66806818ed6b545ed1fc5c8dde445db23fe0982fc4a SHA512 ea2bd88ea61a71e18283f132928445aee016812021633a94233b04a99e6e64cdc0253d3490ba2fe95b41f929f250b293d7c4479159eefee107116a04ff5bf217
+MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-17.2.7-r1.ebuild b/app-backup/bareos/bareos-17.2.9.ebuild
similarity index 94%
rename from app-backup/bareos/bareos-17.2.7-r1.ebuild
rename to app-backup/bareos/bareos-17.2.9.ebuild
index 625e9459f113..aa5473acd458 100644
--- a/app-backup/bareos/bareos-17.2.7-r1.ebuild
+++ b/app-backup/bareos/bareos-17.2.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-inherit eutils multilib python-single-r1 systemd user
+inherit python-single-r1 systemd
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -23,6 +23,7 @@ REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
 DEPEND="
 	!app-backup/bacula
+	acct-group/${PN}
 	cephfs? ( sys-cluster/ceph )
 	rados? ( sys-cluster/ceph )
 	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
@@ -30,6 +31,7 @@ DEPEND="
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
 	!clientonly? (
+		acct-user/${PN}
 		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( dev-db/mysql-connector-c:0= )
 		sqlite? ( dev-db/sqlite:3 )
@@ -88,26 +90,6 @@ pkg_setup() {
 	use mysql && export mydbtypes+="mysql"
 	use postgres && export mydbtypes+=" postgresql"
 	use sqlite && export mydbtypes+=" sqlite"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
-		enewgroup bareos
-		einfo
-		einfo "The group 'bareos' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if ! use clientonly; then
-		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
-			enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bareos' has been created.  Please see the bareos manual"
-			einfo "for information about running bareos as a non-root user."
-			einfo
-		fi
-	fi
-
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/app-backup/bareos/bareos-18.2.6.ebuild b/app-backup/bareos/bareos-18.2.8.ebuild
similarity index 92%
rename from app-backup/bareos/bareos-18.2.6.ebuild
rename to app-backup/bareos/bareos-18.2.8.ebuild
index 62f70274ab04..4bf0b6c7c3b7 100644
--- a/app-backup/bareos/bareos-18.2.6.ebuild
+++ b/app-backup/bareos/bareos-18.2.8.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-CMAKE_WARN_UNUSED_CLI=yes
+CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit eutils multilib python-single-r1 systemd user cmake-utils
+inherit python-single-r1 systemd cmake-utils
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -25,6 +25,7 @@ REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
 DEPEND="
 	!app-backup/bacula
+	acct-group/${PN}
 	cephfs? ( sys-cluster/ceph )
 	rados? ( sys-cluster/ceph )
 	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
@@ -32,6 +33,7 @@ DEPEND="
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
 	!clientonly? (
+		acct-user/${PN}
 		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
@@ -87,25 +89,6 @@ REQUIRED_USE="static? ( clientonly )
 S=${WORKDIR}/${PN}-Release-${PV}
 
 pkg_setup() {
-	# create the daemon group and user
-	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
-		enewgroup bareos
-		einfo
-		einfo "The group 'bareos' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if ! use clientonly; then
-		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
-			enewuser bareos -1 -1 /var/lib/bareos bareos,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bareos' has been created.  Please see the bareos manual"
-			einfo "for information about running bareos as a non-root user."
-			einfo
-		fi
-	fi
-
 	use python && python-single-r1_pkg_setup
 }
 
@@ -120,13 +103,13 @@ src_prepare() {
 			|| die "sed on MyCatalog.conf.in failed"
 	popd >&/dev/null || die
 
-	epatch "${FILESDIR}/bareos-cmake-rados.patch"
+	eapply -p0 "${FILESDIR}/bareos-cmake-rados.patch"
 
 	# fix gentoo version detection
-	epatch "${FILESDIR}/bareos-cmake-gentoo.patch"
+	eapply -p0 "${FILESDIR}/bareos-cmake-gentoo.patch"
 
 	# fix missing DESTDIR in symlink creation
-	epatch "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
+	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
 
 	eapply_user
 
diff --git a/app-backup/bareos/bareos-17.2.6.ebuild b/app-backup/bareos/bareos-19.2.7.ebuild
similarity index 54%
rename from app-backup/bareos/bareos-17.2.6.ebuild
rename to app-backup/bareos/bareos-19.2.7.ebuild
index 487c29eb98ef..cb87707808ea 100644
--- a/app-backup/bareos/bareos-17.2.6.ebuild
+++ b/app-backup/bareos/bareos-19.2.7.ebuild
@@ -1,35 +1,38 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
 
-inherit eutils multilib python-single-r1 systemd user
+inherit python-any-r1 systemd cmake-utils
 
 DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bareos.org/"
+HOMEPAGE="https://www.bareos.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
-	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
-REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl
+	logwatch mysql ndmp +postgres readline scsi-crypto
+	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
 
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
 DEPEND="
 	!app-backup/bacula
-	cephfs? ( sys-cluster/ceph )
-	rados? ( sys-cluster/ceph )
-	rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
 	glusterfs? ( sys-cluster/glusterfs )
 	lmdb? ( dev-db/lmdb )
 	dev-libs/gmp:0
 	!clientonly? (
+		acct-user/${PN}
 		postgres? ( dev-db/postgresql:*[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
@@ -38,7 +41,6 @@ DEPEND="
 			jansson? ( dev-libs/jansson )
 		)
 	)
-	fastlz? ( dev-libs/bareos-fastlzlib )
 	logwatch? ( sys-apps/logwatch )
 	tcpd? ( sys-apps/tcp-wrappers )
 	readline? ( sys-libs/readline:0 )
@@ -47,28 +49,17 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? (
-			!gnutls? (
-				!libressl? ( dev-libs/openssl:0=[static-libs] )
-				libressl? ( dev-libs/libressl:0=[static-libs] )
-			)
-			gnutls? ( net-libs/gnutls[static-libs] )
-		)
+		!libressl? ( dev-libs/openssl:0=[static-libs] )
+		libressl? ( dev-libs/libressl:0=[static-libs] )
 	)
 	!static? (
 		acl? ( virtual/acl )
 		dev-libs/lzo
-		ssl? (
-			!gnutls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
-			)
-			gnutls? ( net-libs/gnutls )
-		)
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -77,141 +68,112 @@ RDEPEND="${DEPEND}
 			app-arch/mt-st
 		)
 	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+BDEPEND="${PYTHON_DEPS}"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	!clientonly? ( || ( mysql postgres sqlite ) )
+	static? ( clientonly )
+	x86? ( !ceph )
+"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
-pkg_setup() {
-	use mysql && export mydbtypes+="mysql"
-	use postgres && export mydbtypes+=" postgresql"
-	use sqlite && export mydbtypes+=" sqlite"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bareos 2>/dev/null)" ]; then
-		enewgroup bareos
-		einfo
-		einfo "The group 'bareos' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if ! use clientonly; then
-		if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
-			enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bareos' has been created.  Please see the bareos manual"
-			einfo "for information about running bareos as a non-root user."
-			einfo
-		fi
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bareos/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
+	use mysql    && export mydbtypes+=( mysql )
+	use postgres && export mydbtypes+=( postgresql )
+	use sqlite   && export mydbtypes+=( sqlite )
 
 	# enables default database driver in catalog
-	pushd src/defaultconfigs/bareos-dir.d/catalog >&/dev/null || die
-		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE/d' MyCatalog.conf.in \
+	pushd core/src/defaultconfigs >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
 			|| die "sed on MyCatalog.conf.in failed"
 	popd >&/dev/null || die
 
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+	# fix gentoo version detection
+	eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch"
 
-	# do not strip binaries
-	for d in filed console dird stored; do
-		sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die
-	done
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
 
-	eapply_user
+	CMAKE_USE_DIR="$S/core"
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	local myconf=''
+	local mycmakeargs=()
+
+	CMAKE_USE_DIR="$S/core"
 
-	addpredict /var/lib/logrotate.status
+	pushd core/platforms >&/dev/null || die
+	cmake_comment_add_subdirectory '${DISTNAME}'
+	popd >&/dev/null || die
 
 	if use clientonly; then
-		myconf="${myconf} \
-			$(use_enable clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
 	fi
 
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable acl) \
-		$(use_enable ipv6) \
-		$(use_enable ndmp) \
-		$(use_enable readline) \
-		$(use_enable !readline conio) \
-		$(use_enable scsi-crypto) \
-		$(use_enable sql-pooling) \
-		$(use_with fastlz) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with sqlite sqlite3) \
-		$(use sqlite || echo "--without-sqlite3") \
-		$(use_with ssl openssl) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable lmdb) \
-		$(use_with glusterfs) \
-		$(use_with rados) \
-		$(use_with rados-striper) \
-		$(use_with cephfs) \
-		$(use_with jansson) \
-		"
-
-	econf \
-		--with-pid-dir=/run/bareos \
-		--with-subsys-dir=/run/lock/subsys \
-		--with-working-dir=/var/lib/bareos \
-		--with-logdir=/var/log/bareos \
-		--with-scriptdir=/usr/libexec/bareos \
-		--with-plugindir=/usr/$(get_libdir)/${PN}/plugin \
-		--with-backenddir=/usr/$(get_libdir)/${PN}/backend \
-		--with-dir-user=bareos \
-		--with-dir-group=bareos \
-		--with-sd-user=root \
-		--with-sd-group=bareos \
-		--with-fd-user=root \
-		--with-fd-group=bareos \
-		--with-sbin-perm=0755 \
-		--with-systemd \
-		--with-db-password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` \
-		--enable-dynamic-cats-backends \
-		--enable-dynamic-storage-backends \
-		--enable-batch-insert \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-}
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd mysql lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=yes
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmysql=$(usex mysql)
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dpostgresql=$(usex postgres)
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsqlite3=$(usex sqlite)
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
 
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
+		cmake-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	newicon src/images/bareos_logo_shadow.png bareos.png
+	cmake-utils_src_install
 
 	# remove some scripts we don't need at all
 	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
@@ -235,7 +197,7 @@ src_install() {
 		diropts -m0755
 		insinto /etc/logrotate.d
 		insopts -m0644
-		newins "${S}"/scripts/logrotate bareos
+		newins "${S}"/core/scripts/logrotate bareos
 
 		# the logwatch scripts
 		if use logwatch; then
@@ -244,14 +206,29 @@ src_install() {
 			dodir /etc/log.d/scripts/shared
 			dodir /etc/log.d/conf/logfiles
 			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
 			popd >&/dev/null || die
 		fi
 	fi
 
 	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
 	if use clientonly || ! use director; then
+		if use systemd; then
+			rm -vf "${D}"/lib/systemd/system/bareos-dir.service
+		fi
 		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
 		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
 		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
@@ -267,6 +244,9 @@ src_install() {
 		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
 	fi
 	if use clientonly || ! use storage-daemon; then
+		if use systemd; then
+			rm -vf "${D}"/lib/systemd/system/bareos-sd.service
+		fi
 		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
 		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
 		rm -vf "${D}"/usr/share/man/man8/bextract.8*
@@ -284,37 +264,39 @@ src_install() {
 
 	# documentation
 	dodoc README.md
-	use ndmp && dodoc README.NDMP
-	use scsi-crypto && dodoc README.scsicrypto
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
 
 	# vim-files
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bareos.vim
+		doins core/scripts/bareos.vim
 		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bareos_ft.vim
+		newins core/scripts/filetype.vim bareos_ft.vim
 	fi
 
 	# setup init scripts
 	myscripts="bareos-fd"
 	if ! use clientonly; then
 		if use director; then
-			myscripts="${myscripts} bareos-dir"
+			myscripts+=" bareos-dir"
 		fi
 		if use storage-daemon; then
-			myscripts="${myscripts} bareos-sd"
+			myscripts+=" bareos-sd"
 		fi
 	fi
 	for script in ${myscripts}; do
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd-16 "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
 		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
 
 		# now set the database dependency for the director init script
 		case "${script}" in
 			bareos-dir)
-				sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die
+				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
 				;;
 			*)
 				;;
@@ -326,13 +308,21 @@ src_install() {
 	done
 
 	# install systemd unit files
-	use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
-	use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-	systemd_dounit "${FILESDIR}"/bareos-fd.service
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit core/platforms/systemd/bareos-dir.service
+			use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service
+		fi
+		systemd_dounit core/platforms/systemd/bareos-fd.service
+	fi
 
 	# make sure the working directory exists
 	diropts -m0750
 	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
 
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
deleted file mode 100644
index 3cdee15d4db7..000000000000
--- a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
---- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
- 
- all: Makefile
- 	@for I in ${all_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
- 	done
- 
- depend:
-@@ -55,9 +54,8 @@
- 	
- bacula-fd: Makefile	   
- 	@for I in ${fd_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
- 	done
- 
- #-------------------------------------------------------------------------
diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
deleted file mode 100644
index 94d8fb60120e..000000000000
--- a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
---- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@ 
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index 4f7694434a3e..bc44d44732b3 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="cephfs">Enable cephfs storage backend</flag>
+    <flag name="ceph">Enable ceph support</flag>
     <flag name="clientonly">Only install file-daemon (client)</flag>
     <flag name="director">Install director</flag>
     <flag name="fastlz">Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag>
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 4e720556ce63..7ca0e34d4d24 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
index 4d90953846c9..8e80a91e7d84 100644
--- a/app-cdr/cuecue/Manifest
+++ b/app-cdr/cuecue/Manifest
@@ -1,6 +1,8 @@
 AUX cuecue-0.2.2-flac113.diff 3528 BLAKE2B ea1daa82d58df58fbfc4ee9b95980f93c1a06090da5765c4f8e2fb09feea9af1b626a51ef06edac24ec1eaf0ebfc93b0d2419ad0240125e41870d894b2a57b90 SHA512 af0bcc1ca7208b9713763b823792becb8785d442cc8f51240c470096b3d90eb21bc36230ec422b42401fa0cfa335aedb578507174083de1b2ffdb01d5f5e3fb6
+AUX cuecue-0.2.2-fno-common.patch 366 BLAKE2B a4218bf38d1165ca644894a199a882e0b9ebdc56830171aa8efe085b2d678175bb5ef0c2a2bd3004cb6ce24d08d74cfec8391d7f39fba808277276c06aa2b118 SHA512 800c3d2214491ce96aed222659f45e57eb2734bfeedcdcb677bd9b5f18ec29143d17acc2a7ab032a94f249cbb65e1bf299c16cefca0ddfd0fbd7f05af879ca4a
 AUX cuecue-0.2.2-namespace.patch 200 BLAKE2B 20a1471d2c7bb4ce08335bda46f1cf8c1e7656aebd9364e26b9847e21edf87f2cdbc20eac3b8cf2921c4e427053535865efec1e622af17723443c597f7c91a3d SHA512 8b0ee39e60e913347f7aac6517e3a150e829099cf5ada6e76e3e4fd2673692c83061b8903676902a1cf6d7f3101ef6cf0a10858f36c44995a207b30ca39d826c
 AUX cuecue-0.2.2-unused.patch 448 BLAKE2B 6ee232d07362cd285e6a7712473f7e99f6d487f08b13f8dc1f7b2e8f145f91aa39c34f3f15399057abf7eabd4fda00495fd546ec7df9503b1295a945cd23bc0a SHA512 d3cf53c0aa25cc8d3a88852564d9bc6eb6a6fd51eff4fc8348a0601ffb268d4d2078fbca6d719b3783587eec97f78fcccd76431e68307b655bcdfe09be6d17b2
 DIST cuecue-0.2.2.tar.gz 97927 BLAKE2B f3577ca59fc277ecd1c6bf68a5ccfa127ae92a00c52a4da00f2be90b87df0522407b7cca616dd44d5d9af44790ca6db146224decfd632d26893d14db9fba3c28 SHA512 586ff819910532f19bf5c0b9ca61b3efe89a4699b05dba2ca6f4a9b78a1716264238e874405486f6b006cf84ed19a1cc96af510f815af9cdb0b76be3e1011595
 EBUILD cuecue-0.2.2-r2.ebuild 1007 BLAKE2B af2f6f7d5fbf3488eb684112510d414db7125b785c06665dfd7a8fde2ec319c90dc3607d6bcbf9c88a1f677cc3e4cb6e1ba7854db189c57e2ceb4b7c9c2318f2 SHA512 97e4a50751e12c7ff3ce776be466684b4ea6d16ab5c97a2985ff27f09c2f38ade1b44d82dd8f3352bcd552cc1f3d9b86c821aeba3c6a0248d1bc3448992b37bf
+EBUILD cuecue-0.2.2-r3.ebuild 1084 BLAKE2B a32df4d3ad7b7521eeee1bcb353108f469af2ad2d2e70c72f886f63d2d7555df915bc48b54c1ab091302a2149ae92bcb66870d36e5d5009f8e2e1e9c8c388dd6 SHA512 f61f13c7b4de5e377ed764ba0d29ece66c87d74ec3aeb5f699fa5d5a5b8f0f04eb64f82060311ae5001084e6a815784aa2a0394edf637822ca512b39daaa34ad
 MISC metadata.xml 379 BLAKE2B 10642874a33da77fd2f8c3aa6ddd983ec157e50eb79aa4d4bec9ad9c538b36f54cd36b4ea98b7295fa8e486bd46d14a40ed161c56be87dc3eac1bd687f9e0c58 SHA512 b66aca65ce1c6beecb9c4c3cb65153dcb32aa70de53ecccf9171e2a0163af4f213d5fe753949a3bfb49a476a82856f977972bbe535034533544066b672a79b6c
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
new file mode 100644
index 000000000000..03166b162e34
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug 254745"
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
new file mode 100644
index 000000000000..9eb8b18e8386
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/libcuecue/cuecue_internal.h
++++ b/src/libcuecue/cuecue_internal.h
+@@ -57,7 +57,7 @@
+ typedef int (*FUNC_DECODER)(char* file_source, char* file_destination, PROGRESS_CALLBACK callback);
+ 
+ #define CUECUE_ERROR_LENGTH 1024
+-char cuecue_error[CUECUE_ERROR_LENGTH];
++extern char cuecue_error[CUECUE_ERROR_LENGTH];
+ 
+ #endif /* __CUECUE_INTERNAL__ */
+ 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d47fac5686ce..62e4e24877e3 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 2c82d5af360f..46f7ebc64d36 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -2,5 +2,5 @@ AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517
 AUX shed-1.15-interix.patch 313 BLAKE2B 423d51410a5371ee1fa0ae2e0d4426dddd410ea060a269f6d3c6b99826aa8d57635bb9a0cfeb82fcf2f51dcf179b0815485491110df3501d1e23ff950d838475 SHA512 31d403d95ce106443ccfe8c92b9621842bfc4264c71280398bb7c0d827d98bf28b403dce3c6ae4523b7ac30a8f529aac6d7cc30a91313a2e2a3d033766469e69
 AUX shed-1.15-tinfo.patch 355 BLAKE2B 5acffe509b9174187b4383f15bed90600790ed0267ee1dbc2713a28e2b8fd0a5eb67cdb1f84a635012128abd5075f9daa0ffdc86abbdd29d170a9b48868dd52c SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710
 DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.15.ebuild 588 BLAKE2B 5f63238a8fa37e46de6b404fae01560b309e6ebe52c929dfb5d3f0ae86f20c574223afc202b942c3be9fa6c45632abb5d53c4250ed95965e9a624c15d479b68a SHA512 7ebcbae53daff16b1886a8625e38a3c6cc8fd91a0e897711477c1f9521e6873f1b9f6dace8ededf9cd0962da87fd73b424b630e21f0a45f72439d9a2c9d94707
+EBUILD shed-1.15.ebuild 608 BLAKE2B 000613f1cef42ac582e385d816b2982ab2b6063867255d6138945b357629cc70a34b3a08fe8983f0e2e21767050fbdad2e23b4e4cc96ba3a26cd29c99162652c SHA512 f9a00e6cda4507f5e5e6c3d4a28bdb4ab54cdc132d18183ab60ec13ea5afc34f0bc24741d392af58bf054ede32cbc3c4025e2a1247faf4b29f2167863d00eaf7
 MISC metadata.xml 299 BLAKE2B ae48e2797586095e3e0d22645c036826b7165079cda4be2499cdf201e37806f0600086f9b0a6d52217b63f63e759c5d2ce02bddb2f828d1d4719898b0ad7f3a9 SHA512 ed903a7f91fa008f63e358253d7e66988cb57b616a8bf6e546f8a1d874e92524b29ef671a96f0e8fc56410619ff541d50e65ab788cf5373164d58b7afa625868
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index 7918554f3ecd..8609122c355e 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.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"
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index da24138bb3d9..ab5f58a97cf7 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest
index 10fc66af090a..91af56492006 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,4 +1,6 @@
 AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
 DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
+DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4 SHA512 e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e
 EBUILD lxc-templates-3.0.3.ebuild 517 BLAKE2B 1caf949f9631ad3a9d131d33a5e53e97a0015e9052f38c47ab44a470874543ce6f3af0c70658cb3a7733fab7eb98b195aefc1d6c11eff6e89df3f40127ebe21a SHA512 9a55e11c97768065397efa35377db21d2e929a4ec6cdd02ee762d7c3eb58a0c31c10fbcb7d49fa4cf2545ee9478c6604160a818601fe7b18de1213e20d57912b
+EBUILD lxc-templates-3.0.4.ebuild 557 BLAKE2B 1bcd8e1cfa156a39edffd0061f4e28698f1db858279528805ac11eb446c0424fe4dffe254cb19214e3ed03270096b3e72577dd514c7cb029c6215277817cd7c5 SHA512 5e932450edd2753d83d49d3256911aef9d34f2bb736a4e57b0773bb820c70eb5decda5bab35c143ce7fea63f7db6874122a554a58971f5acfca6372064ac42be
 MISC metadata.xml 363 BLAKE2B 51b326108ff85ddc7cd01c4348ac3d2117a97ffc9970da0de2843fe26a998a093d04d2faf80dc9600ef84f1e5539687abfb65aebb55be63ee9390f2096e57d75 SHA512 79e8e82f7f9596f2add9eed5c3bfb2b56a0902dc1af37710c63d06f34ce4d4359758547d7bc745238389612d44ca9052e0865a312e3e285d229d9ac1580f2ae4
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
new file mode 100644
index 000000000000..2c8e085f0d2f
--- /dev/null
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Old style template scripts for LXC"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+RDEPEND="
+	>=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
+DOCS=()
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 308f1276049a..c72b1dc47a14 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -10,7 +10,9 @@ AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd3020
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
+DIST lxc-4.0.1.tar.gz 1352119 BLAKE2B 0146091c7704397c097f74bfec1e30c0fc542f1cdd58d4359157f01921e916529280ec96c89c8822ab4051e489216a9518f93a630cc324c7ec5b23a3d1f71386 SHA512 e4c0129c9351a46f5bd37d908c69adc2a30359d9d879f11d75860691bf106f08f4fe205f49e511986a33f0b0498b5f613712496893b3e56286a78a341bbaf365
 EBUILD lxc-2.1.1-r1.ebuild 6809 BLAKE2B 1f0f75321095e99d4002f06659c1d2fe172995e32b3c3a9b402dabb147f29c37fbb67b871ccb6313dfa297a6af11a84cc00f3bcaa73a1871257e108108eaa00d SHA512 8e9305aee26956f2944f3bc66e36e7cae33450fae0dd8e2f5e2e7c4833a39172faf11f97ef9634912296a9d13c24c7faacb5591f84b0e74ce50106eda4bce36f
 EBUILD lxc-3.0.3.ebuild 5047 BLAKE2B a648bfd8160f61c1798a6540350ad2b45ae38b5ac8587a5b1a7db7a4f750756b2d65f798c022500c7ea1bfef312aa083f403e8cb61dc116f6ebc91ae5510b077 SHA512 273ff2df6188f58bdc55efb702bd6c92f276bee3baa2cfe0ec550f7ee9707ce6dc2db0bd0ec60276fcfb137c5963dfc7840a6b750a3036a65378bb108d17f47e
 EBUILD lxc-3.1.0-r1.ebuild 4927 BLAKE2B 8787be6be89d6400da0150fca03eb50ac383b89691484c0baae71a4f0f81e3126050753c23791c88d74fe39b00d5465619020a5101ab3111217efd3b1ed9c4b1 SHA512 7d4989b49c96ff2a5df1ac7ba3807ab168955daacb8214651bd169f2077f1dbf2175196a6e1535622a97679440ae510c027bcd9774483e0738bf9e328916772a
+EBUILD lxc-4.0.1.ebuild 3793 BLAKE2B 091ca3d675f9a4207e5566af0f774e3ad6c1c25e3ce5a726efdcd9aa9870c0edbe338234899b6383d807e041e4231e77421421199ba7aea3435e1c68fc4e48b7 SHA512 ed089935ee637615809b5895a4b415d9c397482eff6d9a63d9462f8e9d7635b9413d65b5620f8dd00e8e788da189a7b8c2d0e3c89b3512b9d26789d5a5c94da5
 MISC metadata.xml 644 BLAKE2B a8bb7f99e51e8380244f625feac1752536bbca7fe07a40afc47698e4a831f4d44ece2820c5e73e04a978cea7abcb5789df3d5898d55df0298d6787af1260ea96 SHA512 aa11f327c8ac4f98f7f5ac6357b7fc2eac18521507b27df531db5ae09d7608ae526917430afe00f110889f391a12d1bac110c7c7377bad6e9c07ff22020d97d9
diff --git a/app-emulation/lxc/lxc-4.0.1.ebuild b/app-emulation/lxc/lxc-4.0.1.ebuild
new file mode 100644
index 000000000000..9b5992325955
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor examples pam seccomp selinux +templates"
+
+RDEPEND="app-misc/pax-utils
+	net-libs/gnutls
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/awk
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=app-text/docbook-sgml-utils-0.6.14-r2
+	>=sys-kernel/linux-headers-3.2
+	apparmor? ( sys-apps/apparmor )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
+	local myeconfargs=(
+		--localstatedir=/var
+		--bindir=/usr/bin
+		--sbindir=/usr/bin
+		--with-config-path=/var/lib/lxc
+		--with-rootfs-path=/var/lib/lxc/rootfs
+		--with-distro=gentoo
+		--with-runtime-path=/run
+		--disable-werror
+		--enable-doc
+		$(use_enable apparmor)
+		$(use_enable examples)
+		$(use_enable pam)
+		$(use_with pam pamdir $(getpam_mod_dir))
+		$(use_enable seccomp)
+		$(use_enable selinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+
+	DOC_CONTENTS="
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index f4bd642818eb..ced5bb8a48c5 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,9 +1,13 @@
 AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e997241a35159e052598d4b9da77ca402a0eb90fcb6fae74ac7d9dca9b8383843fd67fb88b6cab474e547d892ac414d4b SHA512 2857ec4e4856d47340163c10644805ee7a65a0095539c7fdc422b874d1af645187a1de0aff4844d9ed0387cebbd82dbb33da32a839b6dda02df4c3d741e88d76
+AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
+AUX lxd-4.0.0.initd 1097 BLAKE2B 8cd967f37edc7c87a5d225dc77a39e6696596fb9d53829289b75b3f136572aaaaede5ad78360c0ca2055bcf23627fd75102616ff9da604785bdcbdcb57ae81ff SHA512 5a40f0e7a6fe5e8b301f8fc22344fed64fe8b8894a175600e938f147f49ccf4fa71c75fdfe25ba936c65435fcabdc5f7a606993093e5ffdb7dbc4e0b9f03621d
 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
+DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
 EBUILD lxd-3.14.ebuild 6865 BLAKE2B 56a86d6bb704c3c562654d01953b566f34e9d57abf915972899b663b61e8d9fe1e50523a439a406b013e7396c3286e104859bf4ca23106306ee719ef41810d80 SHA512 aadb152acac7f5784028bbd89c8ebc105992dd6898e22ed36b26889969b7ce1cffdb79e8db1c0e0a43ca98cae7feee3f133165c3f624b87611dfed1dbe0c8511
 EBUILD lxd-3.16-r1.ebuild 8076 BLAKE2B 051b4da2220e7badf1a5b298ec47e9ce855e115d7dac17643c8e4f15f8537c10329986fe2f7f160fd90b388989ae7227a5926ed7946f6930755340af93261ad9 SHA512 4f631def5be1699989e9c63d36f32816e966be0b4e3724a7fbd41c3e3f2645a1ca84b92e58f2562430ff3c3d6354831bd947a63c0815cb98f10cb0e91a2375bb
+EBUILD lxd-4.0.1.ebuild 5667 BLAKE2B 0d264505373865191a0db35f39e93a02783696904f1e254e8e4eb4b698652db207bc22e222f7c70337a9db648f0af3d64f3faad0b21541a158e73cbf0bc7179d SHA512 6ce8d93d08af5f15984d4f0a099edb478a3bc42ea13a4028b01288e8436de0352e97f78a35edc8451f5f8399bb37faaf9fef5c110b71fc0ef5cb53fee36c8fd5
 MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
diff --git a/app-emulation/lxd/files/lxd-4.0.0.confd b/app-emulation/lxd/files/lxd-4.0.0.confd
new file mode 100644
index 000000000000..68cf344995be
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.confd
@@ -0,0 +1,23 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+# Enable debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enable verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enable syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
new file mode 100644
index 000000000000..03ec12e44f56
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+TIMEOUT=10
+
+extra_commands="stopall"
+
+depend() {
+	need net
+	need lxcfs
+}
+
+start() {
+	ebegin "Starting lxd service"
+
+	modprobe -f loop > /dev/null 2>&1
+
+	# fix permissions on /var/lib/lxd and make sure it exists
+	install -d /var/lib/lxd --group lxd --owner root --mode 0775
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec ${DAEMON} \
+		--background \
+		--make-pidfile \
+		-- \
+		${LXD_OPTIONS}
+	eend ${?}
+}
+
+stop() {
+	if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
+		stopall
+	else
+		ebegin "Stopping lxd service (but not containers)."
+		start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+		eend ${?}
+	fi
+}
+
+stopall() {
+	ebegin "Stopping lxd service and containers."
+	lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1
+	if [[ ${?} -ne 0 ]]; then
+		lxc stop --all --force || eerror "Could not stop all containers."
+	fi
+	if "${DAEMON}" shutdown; then
+		rm -f ${PIDFILE}
+		eend 0
+	fi
+	eend ${?}
+}
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
new file mode 100644
index 000000000000..21a6fcee0663
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+# Needs to include licenses for all bundled programs.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[seccomp]
+	dev-lang/tcl
+	dev-libs/libuv
+	dev-libs/lzo
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	acct-group/lxd
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:0=
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+# To no one's surprise uses internet connection.
+RESTRICT="test"
+
+# Go magic.
+QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
+	/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+common_op() {
+	local i
+	for i in dqlite raft; do
+		cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	export GOPATH="${S}/_dist"
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
+
+	common_op eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/_dist"
+
+	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+	export CO_LIBS="${GOPATH}/deps/libco/"
+
+	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+
+	export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
+	export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
+
+	export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
+
+	cd "${GOPATH}/deps/sqlite" || die
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+
+	export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
+	export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+	export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
+
+	local j
+	for j in sqlite raft libco; do
+		cd "${GOPATH}"/deps/${j} || die
+		emake
+	done
+
+	ln -s libco.so.0.1.0 libco.so || die
+
+	cd "${GOPATH}/deps/dqlite" || die
+	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+
+	# This is mostly a copy/paste from the Makefile's "check" rule, but
+	# patching the Makefile to work in a non "fully-qualified" go namespace
+	# was more complicated than this modest copy/paste.
+	# Also: sorry, for now a network connection is needed to run tests.
+	# Will properly bundle test dependencies later.
+	go get -v -x github.com/rogpeppe/godeps || die
+	go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
+	go get -v -x github.com/golang/lint/golint || die
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	for m in dqlite libco raft sqlite; do
+		cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
+		emake DESTDIR="${D}" install
+	done
+
+	cd "${S}" || die
+
+	# We only need libraries, and we don't want anything to link against these.
+	rm "${ED}"/usr/bin/sqlite3 || die
+	rm -r "${ED}"/usr/include || die
+	rm -r "${ED}"/usr/lib/lxd/*.a || die
+	rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/${PN}-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+
+	dodoc AUTHORS doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog
+	elog "Optional features:"
+	optfeature "apparmor support" app-emulation/lxc[apparmor]
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest
index 6dc57ee4fb8c..d9f62ca356c1 100644
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ b/app-emulation/qemu-riscv64-bin/Manifest
@@ -1,3 +1,3 @@
 DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0
-EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 467 BLAKE2B 21775993cbb9db3cd2e613b8e3ebec5a0fbd6c456766a2dde70e72adb3c8c4cda0f34afce49c2470220ebeab44f118105b0052a031cbe58e95fd9d7cc4cc0ea6 SHA512 f39ac61bef07a769e7a5ac59f7be78f949fa5bc5de34705e76768a5f62ab9aeca75aeda1776024f085781e5ca780de68501d8b231f18443fa49dce0c4d42b5ff
+EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
 MISC metadata.xml 479 BLAKE2B 9073a68b14d921d5557835e3f3518f3e35688452310d8d9c89233abca25277588a67eee0641e0cfb8afb7951fd29281ca7add9a20ff45acae1f3532ad051e862 SHA512 78d7fa09208d0cb1c6bad33a92d059858d94939821147fa2f095b961bee64ea29db6dedba6e68dac9db6ae2b985e3c8462d56bbe079fbe074c623257a830b6ff
diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
index 30853f041f52..650e2af57e19 100644
--- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
+++ b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,8 @@ KEYWORDS="~amd64"
 
 RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
 
+QA_PREBUILT="*"
+
 S=${WORKDIR}
 
 src_install() {
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 81efd59ec84b..a6fb026d6056 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -13,4 +13,4 @@ EBUILD wine-vanilla-5.6.ebuild 17575 BLAKE2B caa74ad628520bd34a659b9c9f453fd62c8
 EBUILD wine-vanilla-5.7.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
 EBUILD wine-vanilla-5.8.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
 EBUILD wine-vanilla-9999.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0
-MISC metadata.xml 3342 BLAKE2B a4be85e6b184b90e008d8beed5aabda03e9a378c5b348bcbdb98d8dcac52328915a39483943ab799abab49b755e36782bab1103400c4e40186da44abe40e4e47 SHA512 45f4066692fc4ff90124233313bc4804530925936aa260051f51558fed031de421b1c3d6941126733dc21d6b13a7821af4676333f25ef4eab355e170005ca444
+MISC metadata.xml 3141 BLAKE2B 07e1e174d2acc8cb6e5b2767daa8b70490f75102e95f17d8b55e416aa50c4cc47c163cf7b0d95140bab074213b490fdd0f1297703369d413d7c00486800b8232 SHA512 d5eec710aebe9ae4eab2bb4e9c14079884c60882f1cec1b3e42bcb95008acb29e26ce633b55518bd5bab4c581e1194bdb104f0e630c683360994bfd666b059e4
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index 03b00009d222..497dd69c907f 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
-		<description>
-			This package must be kept in sync with repo/proj/wine repository.
-			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
-		</description>
 	</maintainer>
 	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ed666528ec31..057a51ac4353 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 9d4a25b212f5..20a2d7ad3ff7 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
 DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
-EBUILD ibus-anthy-1.5.10-r1.ebuild 1285 BLAKE2B 570cb96794d1fbb1964980ec302e9e120b34a0c8daff255e70fe29c921d7675920df9f93d27ae668268f83e64973d17acf3a2f82d35ffbc313ec8c7cade6e484 SHA512 b27e6034f3740078f1a0a6278b6ec3934ac9f7d89ada688e18a9430f9f903ba20451ad8a871203a2801bad30a9d5ced244e25dc1976055aba102091b760c63ee
-EBUILD ibus-anthy-1.5.11.ebuild 1268 BLAKE2B 5bf626b2b42182645e30a4cc81fb202f3f375fa2ec830bc8ae0e747588217b18b2d03cdd3c380fa22ffbbd061aa87bd43578186b10da113377abe438add3aa4d SHA512 54ccf4f6a937c652f2bb2ddc35435bd8c8e7f7c0f341f8037982bdc92fc58f5e316f27fef4f42cd6dc9b84603569f26dc934d77f80e742e643804fbc4d414090
+EBUILD ibus-anthy-1.5.10-r2.ebuild 1328 BLAKE2B d4a5f82c9cc64baf8c7a85ea96fd086720f5c035bbbc77775db9fb024e49bf9d881c67fcaa4e0fc3712e430bfe427c1dcd2f8d9e9a4d935bff9dfdbf5691ef4a SHA512 e40b42973bdde6c303e2efdee020fb5b30fdfcce71bd0003d25f4bfed1f5921728736252194de8dc074b3fdbc93c201053913c975ce5684f36f8bf9148b9f682
+EBUILD ibus-anthy-1.5.11-r1.ebuild 1311 BLAKE2B 7f5f22fb4b5d1c86c73ebaa93ba6d8df6c77ad8324d3321e289435b0bbdfc9824c7cf6570c96c020512d8a73e77891ea4347298ac890bafcad7149acda591f2b SHA512 16fd92d4d98914cbea997132d7727e38700ad422ebd2e0974b66f6873730be71ad330dd82719e506493e141edf9a0516869bcd5ac784f83fdfc3e5fbdd1a5f6c
 MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
similarity index 86%
rename from app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
rename to app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
index f8d2fd9b0ff5..b70a75b59869 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	default
@@ -53,11 +53,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 
 	if ! has_version app-dicts/kasumi; then
 		elog "app-dicts/kasumi is not required but probably useful for you."
@@ -65,5 +67,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
similarity index 85%
rename from app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
rename to app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
index b818978cb1ad..3b04c215cea5 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Japanese Anthy engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	default
@@ -52,11 +52,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 
 	if ! has_version app-dicts/kasumi; then
 		elog "app-dicts/kasumi is not required but probably useful for you."
@@ -64,5 +66,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index cc3a57323eac..80c57e79a055 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,5 +1,3 @@
-DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
 DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
-EBUILD transifex-client-0.12.4.ebuild 638 BLAKE2B 0b53b4af9264e9b5bfe96cbfe08da48a16ecce00fc06779c2cf54c622efddb4096fbe414fc9d45c74c51f058f9795ea765c29b371768041ddb2435d592786b46 SHA512 1273f8da1fb49837fe52447fca6010b9054239b0d9599ae5ba0d9ffde40f9bf9d993a6c31e849450a46d6d1f1641589c1350cb0117bc40a96faa3a7325ae7f20
 EBUILD transifex-client-0.13.9.ebuild 752 BLAKE2B 0ddbf4e4a08f2890dd3da509f2d3ae52a2235268a8f845960a7c92279aa3bb573adf6d3102219c8c7e399a080fb28d6f18ed689b01244f523bc0bc723eed7212 SHA512 7eb6b8ddfc035f0331b0bb4f0b0dde20131c54c4553429a486ef97b338e8b458083f642807e8834b1e30b727ed51982279d8648ae991fffb12c25671d73d0dc5
 MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
deleted file mode 100644
index 44dd3f5483d8..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f9e38f55bc39..0a1b2d782413 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 9e9ef82f2e74..6afcc9832e9a 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,6 +1,3 @@
-AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b89870e0728c92dec008abf0a978aa1ea496245294c0a8eed75498abec5a01b7fea8efa8185b7c54d4140e75af8abd SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee
-AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
-AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
 AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f929f639310bd1089bf4134bf1aed722701f23b108db62057b75328e2debf1b0313cdc7eef60b116173b7e5d SHA512 ce02eeba87606a1a95b301abdb42eaad2bcd6049ebac1514cd4316f0202439142c7c6d529f34770a663f10e34190ac22dde039c36c51a1e1d5300b1dc56bd555
 AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b
diff --git a/app-misc/jq/files/jq-1.5-dynamic-link.patch b/app-misc/jq/files/jq-1.5-dynamic-link.patch
deleted file mode 100644
index dbc2f11acb7f..000000000000
--- a/app-misc/jq/files/jq-1.5-dynamic-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c3a771f..274c01e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -84,7 +84,7 @@ main.c: version.h
- 
- bin_PROGRAMS = jq
- jq_SOURCES = main.c version.h
--jq_LDFLAGS = -static-libtool-libs
-+jq_LDFLAGS = 
- jq_LDADD = libjq.la -lm
- 
- if ENABLE_ALL_STATIC
diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
deleted file mode 100644
index edb07d8388b5..000000000000
--- a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
-From: Nicolas Williams <nico@cryptonector.com>
-Date: Sat, 24 Oct 2015 17:24:57 -0500
-Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
-
-This was an off-by one: the NUL terminator byte was not allocated on
-resize.  This was triggered by JSON-encoded numbers longer than 256
-bytes.
----
- src/jv_parse.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/jv_parse.c b/src/jv_parse.c
-index 3102ed4..84245b8 100644
---- a/jv_parse.c
-+++ b/jv_parse.c
-@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
- 
- static void tokenadd(struct jv_parser* p, char c) {
-   assert(p->tokenpos <= p->tokenlen);
--  if (p->tokenpos == p->tokenlen) {
-+  if (p->tokenpos >= (p->tokenlen - 1)) {
-     p->tokenlen = p->tokenlen*2 + 256;
-     p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
-   }
-@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
-     TRY(value(p, v));
-   } else {
-     // FIXME: better parser
--    p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
-+    p->tokenbuf[p->tokenpos] = 0;
-     char* end = 0;
-     double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
-     if (end == 0 || *end != 0)
diff --git a/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch b/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch
deleted file mode 100644
index 95ba0e058056..000000000000
--- a/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2
-Author: David Tolnay <dtolnay@gmail.com>
-Date:   Sat Nov 21 10:05:37 2015 -0800
-
-    Support --without-oniguruma
-
-diff --git a/configure.ac b/configure.ac
-index 9e2c8cf..7f6be34 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,27 +52,26 @@ fi
- AC_ARG_WITH([oniguruma],
-     [AS_HELP_STRING([--with-oniguruma=prefix],
-         [try this for a non-standard install prefix of the oniguruma library])],
--    [ONIGURUMAPATHSET=1],
--    [ONIGURUMAPATHSET=0])
--
--if test $ONIGURUMAPATHSET = 1; then
--  CFLAGS="$CFLAGS -I${with_oniguruma}/include"
--  LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
--fi
--
--# check for ONIGURUMA library
--HAVE_ONIGURUMA=0
--AC_CHECK_HEADER("oniguruma.h",
--    AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;]))
--
--# handle check results
--if test $HAVE_ONIGURUMA != 1; then
--    AC_MSG_NOTICE([Oniguruma was not found.])
--    AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ])
--else
--    AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
--fi
--
-+    [],
-+    [with_oniguruma=yes])
-+
-+AS_IF([test "x$with_oniguruma" != xno], [
-+    AS_IF([test "x$with_oniguruma" != xyes], [
-+        CFLAGS="$CFLAGS -I${with_oniguruma}/include"
-+        LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
-+    ])
-+    # check for ONIGURUMA library
-+    have_oniguruma=0
-+    AC_CHECK_HEADER("oniguruma.h",
-+        AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;]))
-+    # handle check results
-+    AS_IF([test $have_oniguruma = 1], [
-+        AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed])
-+    ], [
-+        AC_MSG_NOTICE([Oniguruma was not found.])
-+        AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX'])
-+    ])
-+])
- 
- dnl Check for valgrind
- AC_CHECK_PROGS(valgrind_cmd, valgrind)
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 90383ea84f67..4fb5664667b4 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cce54ec601a3..9e6553829382 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,6 +4,7 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343
 AUX libreoffice-6.3.3.2-mysql-connector-c-8.patch 1707 BLAKE2B b8fe46888d287384d72819ac38735642bee66885e04d81c0b18124e2fb5c4fdf486368920578d1d44e268d870d3280ecb081d5d65721cb78762ca02ee52e5b6e SHA512 b4a6b2e0e33e4521079b58d522019997337f82d24826fb12aded275ae01985fd286ab4f0bf5f0685cdf1f92ed17ed545b715181b11e7a8b580e7ba0578b2903c
 AUX libreoffice-6.3.4.2-poppler-0.83.patch 2703 BLAKE2B 6936c91d4b5d8cab3aa17b81410b9cda759f83d034a4ffb0bd1facb890458361d8e0c445d9371448390526d9f1dd850b331436770f86f0182c621f1b22015d2a SHA512 ca572090508577fa01fff00a0b9e5372a11f7876cfdd5c0537c63e89f98c7171c854275ab059657b99a8cec89c3edd7bf22f3a46f375a81c44d207596cc91186
 AUX libreoffice-6.4.2.2-poppler-0.86.patch 777 BLAKE2B 1e798ef4a66dd872963e3436e6b38d0a1741a1ddc4f3615f70d322d1ec506a66ac1d9306af95c7cd0b8b40d8347384f74928ece93a4484a8c36ce96b14977531 SHA512 dc34c2c86661760975ade1777d46899e05436819f82ada97f2ff9feb8a80a67d881c90c8157f3e3fd0850cdd5eb12c0000dc8670943d85d4dd19e0cfa772f4bd
+AUX libreoffice-6.4.3.2-boost-1.73.patch 4356 BLAKE2B 3fc87602e75c612d03cd657ec82598bd11238bb97acac2f070ee11758c229d4e481b76125206fbdc5d8966ae3f5f9586798f73136b87f2556bb9c859642eca94 SHA512 927a3ee94ca1e9eae34768b688b980ec937abccbab4d5b12409b0c459c92a7c666d4ffbb113b9173c1e29ced1cbd67df12335acca62e8377278d8b53ed89380e
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -22,7 +23,7 @@ DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cf
 EBUILD libreoffice-6.3.4.2-r1.ebuild 16002 BLAKE2B 0a8d8f51f5e5adce47608c1610e41661961ccd7611a610e036bc05aeab9af31bebac0ddc0818f2ee03dea0829a66e2d9b5c1eb5608aed45fdad47f60962e1168 SHA512 1e338f01b7b7f1a62e01375af679fe3e0c09401bf2c8549d55c72c6227bf475433534048d7a47cbb2e66577212c7afdc4d9dfb313fc2e5fcdb0c07a65a1a4464
 EBUILD libreoffice-6.3.5.2.ebuild 15965 BLAKE2B cbcd130588a323d4a3c66f5deb7f791cbc2e4bc0b9ab28cf1ccbac9cc0331508cad10f996704ec524b903d3402a312ac9b20d6b77c3c11768e42b9e6a5b078e5 SHA512 58157f7f0bdc8874d3943279ce0f4b1a1706c3d5a33f5e60e899a3f17afd9548a651d0d3ca618051fbab5fbcd16d610047f5c20794fbcc4e5582a6a1f5d1edb2
 EBUILD libreoffice-6.3.9999.ebuild 15962 BLAKE2B f57424a4140936f4cd1d1eb53a30d1763c306b702aadfe35cf72f0af5643fa763ad6be4a9c5db126d04101501de744cd1bc33698a17608f9cbfddc6a57c574d2 SHA512 c26434db9e8d83e4b7d6a872849e8ab96b6b772642dc6ba65edf8f08ffc93dbfbb8edd0856cacdf2a098412eb284a81ec3120cbb85222146ed0b06bdebb6c23e
-EBUILD libreoffice-6.4.3.2.ebuild 15710 BLAKE2B 43b545920104bbb9f807b2dcae80ec42a1d193ea8e6e4f53dd93d3ab7a659fe42772f1393bbdcc9480f5c5fdafa5aed6589d150bc9ecfe42c876bf63963be059 SHA512 be8dc91395d7ca675c3a9ca802a2d0c6ad85e55f6b872d7b8eb531106ccf87ec8f38b12e73a6db4e8249b3036a236a0a950e95f0c260137855f676930a4e371a
+EBUILD libreoffice-6.4.3.2.ebuild 15775 BLAKE2B c3f468933e42b8fc51657d0df29905f2b53d06e4bb70e835d96c3525a7279342fdb83e307024ab25fbe3607e14038258a871ec38bcd665bbbeb13cb8631a01b6 SHA512 e07f4e83cf7e89c26d4c4caa3758e17a8a908ed31e92450d34f20d731fa9050bd462f3cf9b777464bb24d22c713e66d64646d589805d4d9337745edce40480eb
 EBUILD libreoffice-6.4.9999.ebuild 15598 BLAKE2B 1a411c3bad01eaa27306894aee870b397366fc57f31323eb3a42d4ce7c5d14d99f70926d2dca3d978664163e734a70620600f4597335bf3fb7cdee2a9d7b69b6 SHA512 4484cf3d4f6d985a54fc9fe76edb7f55081733f891a44f194cf0dd8fd0306d70271637d56b6ff34b4cd78012199754d0cdf6b1e61c36b580d0601894c50867de
 EBUILD libreoffice-9999.ebuild 15812 BLAKE2B 66051678cce896841f7cd5a2126569a4013b8a85bd285349ba4694c6e0bae2f62f565999553bfb72017d300874dfd32fac68f37d7f03facb1ea1931f70452936 SHA512 be515741d72c13de64bc4f928bd75d5768ed4f6ae932f70ab9f3a2f5f87cf2a660374cea3a2ea921dc8e4d1b36a36b890d2bd9c7c5318c6c2921fb0df72ed598
 MISC metadata.xml 1007 BLAKE2B 9cfefc8eb71dad67a632810e4b3b91e17534565b245bfd71f2b34819fb96edef9617be5a899778e4ca5f54c7963d43f0a23615c003bd175c41c6f59d245e449c SHA512 5d470c6d1099a5c932e5a7418a72df7999df949c3ca2911efe7a18a900cd7580b00c540eae91478894f86368d7c9840a5a22cd1b2971382d06274caa3c572223
diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
new file mode 100644
index 000000000000..0eb406999223
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
@@ -0,0 +1,118 @@
+From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 29 Jan 2020 12:44:52 +0000
+Subject: replace boost::bimap in sdext pdfimport
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
+bimap out and use something simpler
+
+Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sdext/source/pdfimport/inc/pdfiprocessor.hxx  | 12 ++++--------
+ sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++---------
+ 2 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+index 89f9d601b7b0..9e08d6a6a765 100644
+--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
++++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+@@ -37,9 +37,6 @@
+ #include "treevisitorfactory.hxx"
+ #include "genericelements.hxx"
+ 
+-#include <boost/bimap/bimap.hpp>
+-#include <boost/bimap/unordered_set_of.hpp>
+-
+ namespace pdfi
+ {
+ 
+@@ -160,10 +157,8 @@ namespace pdfi
+         typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
+         typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
+ 
+-        typedef boost::bimaps::bimap<
+-                             boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
+-                             boost::bimaps::unordered_set_of<sal_Int32>
+-                            > GCToIdBiMap;
++        typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
++        typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
+ 
+         typedef std::vector<GraphicsContext> GraphicsContextStack;
+ 
+@@ -178,7 +173,8 @@ namespace pdfi
+ 
+         GraphicsContextStack               m_aGCStack;
+         sal_Int32                          m_nNextGCId;
+-        GCToIdBiMap                        m_aGCToId;
++        IdToGCMap                          m_aIdToGC;
++        GCToIdMap                          m_aGCToId;
+ 
+         ImageContainer                     m_aImages;
+ 
+diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+index c6baa7fee8b2..ed2eaf6510b9 100644
+--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
++++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+@@ -54,6 +54,7 @@ namespace pdfi
+     m_aFontToId(),
+     m_aGCStack(),
+     m_nNextGCId( 1 ),
++    m_aIdToGC(),
+     m_aGCToId(),
+     m_aImages(),
+     m_nPages(0),
+@@ -65,12 +66,13 @@ namespace pdfi
+     aDefFont.isBold     = false;
+     aDefFont.isItalic   = false;
+     aDefFont.size       = 10*PDFI_OUTDEV_RESOLUTION/72;
+-    m_aIdToFont[ 0 ]    = aDefFont;
+-    m_aFontToId[ aDefFont ] = 0;
++    m_aIdToFont.insert({0, aDefFont});
++    m_aFontToId.insert({aDefFont, 0});
+ 
+     GraphicsContext aDefGC;
+     m_aGCStack.push_back( aDefGC );
+-    m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
++    m_aGCToId.insert({aDefGC, 0});
++    m_aIdToGC.insert({0, aDefGC});
+ }
+ 
+ void PDFIProcessor::setPageNum( sal_Int32 nPages )
+@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
+ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+ {
+     sal_Int32 nGCId = 0;
+-    auto it = m_aGCToId.left.find( rGC );
+-    if( it != m_aGCToId.left.end() )
++    auto it = m_aGCToId.find( rGC );
++    if( it != m_aGCToId.end() )
+         nGCId = it->second;
+     else
+     {
+-        m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
++        m_aGCToId.insert({rGC, m_nNextGCId});
++        m_aIdToGC.insert({m_nNextGCId, rGC});
+         nGCId = m_nNextGCId;
+         m_nNextGCId++;
+     }
+@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+ 
+ const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
+ {
+-    auto it = m_aGCToId.right.find( nGCId );
+-    if( it == m_aGCToId.right.end() )
+-        it = m_aGCToId.right.find( 0 );
++    auto it = m_aIdToGC.find( nGCId );
++    if( it == m_aIdToGC.end() )
++        it = m_aIdToGC.find( 0 );
+     return it->second;
+ }
+ 
+-- 
+cgit v1.2.1
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
index 604dc556242d..b379ae94244a 100644
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -253,6 +253,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 
+	# git master
+	"${FILESDIR}/${P}-boost-1.73.patch" # bug 721806
+
 	# TODO: upstream (for now taken from Arch Linux)
 	"${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
 )
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 388cb7a1bb20..73e2e8552af5 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -3,6 +3,6 @@ DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a4
 DIST unoconv-0.9.0.tar.gz 108493 BLAKE2B 36761f5cabd8cf0186ffa74202d8a9e0388ab9dc1a135b8e6b2275ed380de79da85d4955bca446810f4f71dff61bd38d7b131a91930729cbabfb10d656ba3891 SHA512 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469
 DIST unoconv-0.9.tar.gz 108547 BLAKE2B 6620a7adb32c25182fbb5d0b141ec15d461ee7a73d8644e92337fd7748607d0d33a5978add4c72abf2b35f769f8bbfa35d411f77c4750606e22d6cbc7d7b3454 SHA512 1d6448154ec41776ed4d2ffd87b1caa15e231676a1161072676b1f5a466ea6dbae904de3eafb9ab2718fe4ed0ab7a2c9a91b1d19d79ea382c1e7576ea21e7f04
 EBUILD unoconv-0.8.2.ebuild 787 BLAKE2B 40102c2cb89cc14887ca402a9dd09749ef943f5bb6564174fb7a539a44e37948effd276f1741d24718ab80befde3f7513c2f3f4a4e6d850352bcbb23ceffc214 SHA512 fc59e4b7a9cfb7d68b5a0916bd696c4c7c657eb86730bc0a51de49d48f904f2a76cf8d29c56e66387f46e71efac0b6696c38003e024edd45120bc5b7fa106160
-EBUILD unoconv-0.9.0.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
+EBUILD unoconv-0.9.0.ebuild 762 BLAKE2B 4fd0b2af6bfbaaf354bb271db1c1af3c1aa4ccbeb3f4e1bf99d38a5c65ee088611881a07cd2e035dba9cf56954dee31875e7607f930edf3fd36e9b2ed20979c8 SHA512 f35c465b8c2a07e96d782c80f6277965758448fd739d115f10cee5bdc57857dcd858f0beb91d8cb4181fe0316c8283d2b7ed139c841c2da60e8a709393744e2d
 EBUILD unoconv-0.9.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
 MISC metadata.xml 429 BLAKE2B c863daa05c0d7d265b60a04e0b1336067296b3854c83aa2c08891bbfe0d3fd45971312b6385b50c7ccb47676b65e97afee953a675176643c4bde348a6a3f0162 SHA512 3875bd4f015c8ffc902a3aedf042cd46cbe86f4ef6dfd1a493d3d7c171bf12248763e64d1f448800fa571157d3e5adac0aa191c9ad40667762ed17eadf3840ed
diff --git a/app-office/unoconv/unoconv-0.9.0.ebuild b/app-office/unoconv/unoconv-0.9.0.ebuild
index 53aed7fea67a..48504926ab5d 100644
--- a/app-office/unoconv/unoconv-0.9.0.ebuild
+++ b/app-office/unoconv/unoconv-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 30d4e56c4862..843ed0188bd3 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 259f6416cfcd..91d8fbf608d7 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -3,7 +3,7 @@ DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e6
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.3.ebuild 967 BLAKE2B 984f1f693742988f6f4a585786ccbe1aabc7e0359651497dabb0bcaa300d5c3704148919e5f3e4d1bb2c38e0faaeb6bf28017cc1ba9a8f3d50972d691534dd3a SHA512 98ffc5154ef2b894e950417a0755a7a9af28601c36f248bfce6c387240f5f75c5414bf0c8c1a73aad464f29d50e17cfdb7524fa89554a42edfcb7bcff5edffe2
-EBUILD mirrorselect-2.2.4-r1.ebuild 956 BLAKE2B 17dae176c4bb7897e38b4bab0141bb58c0e49058d44027ff246b4356575b8b3619064415f34d8c01ab66e3840c4a484ec0aee22fa6ef2e780926da0d59783e9a SHA512 e6f8bfd830a0c82099f959ab7ae8a29348b42d8b90f99f223056ba8c399547c387033e7ae4df754d8fede0ee341db5fd08a672a47574b889de4820fb0245d58a
+EBUILD mirrorselect-2.2.4-r1.ebuild 955 BLAKE2B af1f82d9124117a757843678924f67ca558515f871103f66ff58d4382a2a7f755409fa6b78375e15ef36a5c0153c68f77be35e0508fec6d74495fe17510cd37e SHA512 d1c29f623719aeb6e6c95b03c7f46bf75caf668946f406149bb30ea0e0cb17aba32cd9c0f0b029c0c3fa402ca932027b9f1cdd74d5bad46a20c784cc1727f572
 EBUILD mirrorselect-2.2.6-r1.ebuild 1483 BLAKE2B affc56795fb7eb3f0ca93f20fce510e7b6ac920df4fd290225e72a58025c0fb471545a42e150072084d59d153d5a97d46f4a15b366df1f336a2ed3b570743104 SHA512 b79de2fd09a365441bbece931153fa6f8b07331f6c6cf2d3ae720db8547b1fd48165066f86f32b4502fa81248f27bb398a5689ba0c7346f16fffcbc51156d302
 EBUILD mirrorselect-9999.ebuild 1124 BLAKE2B d62d53b4ea567ab380d3335a4cef175dd393767e593174d6163d5615f2eb8617aa40fe2670f95122bdd5384735fc72a5e732f8f0685c1d6f7864189c9496701e SHA512 1477928867032a8291e9aed8e5d10ccd4537d2cd3208789bb3f5acf3935ffe0559dcf4e3dc6c68cb9321f0a52bdf0bcfd8fe8ce30561f85730ecae41e2f5cea6
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index 9adc65c1d761..ff6201f96620 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d3de213018bb..666435dcf0ba 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,6 @@
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
 DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
 EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B fd603d2da46ebb4b85e719119fabc82f09fde52bc3ab47704b711c4fbaede96818eace742c98bebd007c7b639634aad1b5690e249ecc5969902b38956235cc8a SHA512 67cd408528edabc58b78627bfe75676b6744b52f7b3269e929348f63390a08cdb9fa4672514b75f6e99915de38679f4ae7c573ae4ddc264e01cf47bdf33de042
-EBUILD portage-utils-0.87.ebuild 2179 BLAKE2B ecbd90f21ef26d89e423e198bd0e8e275aa63a8eabe515a0236c18370a755c18319c1b21c22b07a41eadf338a430bdeb13e753db0830b298853ed72b48aec6fd SHA512 401ce43ba8704b8d2936307e5250cf7335ad555fe4d8e9766ac7577a01540c1018252dc77c145913bb494891fae5f6860f33f80a17d58ab0b5bcd42e8c1652cf
+EBUILD portage-utils-0.87.ebuild 2172 BLAKE2B bd50e15bff368b7660731d44048354a85d3927ab297b7edaa70339558e8a6d17aa51a41d02522c3aebfd75f6364271fc61a0ef340b797d30c676c795f11b1b90 SHA512 9f472181df9bfd16b27da9c24e196dc88786ffc833ee5cfcfa688cb22673bf72edcab7226c1a1abc7df02fa4046619ffe17177ff11a495d6998104437e5c603b
 EBUILD portage-utils-9999.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
 MISC metadata.xml 573 BLAKE2B 7c24e5d74a38a20b0c79c228ca131ee5073cbf0fdccfc2b42221521ae684566b4bf7474743c0a9cd1273b59eb94e2eef63b1db70f0ffed7d688073bb3679e007 SHA512 85f32bcd860ab711ade03cdb4a241722efbba47396b736e302fa2282e363bc8e445daf9316996b1cedb420d2cb102fd416962f05e15a57c51b514d776ac7cd84
diff --git a/app-portage/portage-utils/portage-utils-0.87.ebuild b/app-portage/portage-utils/portage-utils-0.87.ebuild
index 30461bad45eb..2d04620d0e71 100644
--- a/app-portage/portage-utils/portage-utils-0.87.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.87.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	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"
 fi
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a210e4809838..298f882cfd27 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7da46fa1e70e..352204bd3cf0 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,9 +6,11 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d3281379c96d0ae63b3073b6b5ed055bd2eca0ae728f1471460e3aa8cf9b3afa3e489c4c2f02c6849b39b94e2c2023a SHA512 64f1779ea16e2aedbc91e815b015ffbcfcc2d50035dddc9b33588007ceeeaa5cf4cca84b40fbc9c5808e9b6dab3b04047f37505815120a1e66650447363672f2
 DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
 DIST calibre-4.15.0.tar.xz 37033864 BLAKE2B fbb8965f438b438e0274fd8fbd23b633fb39bf3d746b0d8d1947e54cb6a21e39346031be6723adc1ecb83b4145562ec8a1e36805b96bad00451c0afbccb8d570 SHA512 d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04
+DIST calibre-4.16.0.tar.xz 36964244 BLAKE2B e2c94ea882addff3a7def2b7d0bc286fc3bc499190469e9bfea99d710b4cdbb6b59ca2848ef5551d4375d22c582462962634c0329f0adca05dd6dc137dbea0ba SHA512 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
 EBUILD calibre-4.11.2.ebuild 8545 BLAKE2B d9d02091f3118ffe7d2fc7422e342c82a73ae13f7c761eb3d855b7f3837d8acace61d04ba36aa72a3e9ff7f543397f9911150cfb2feb32262eef8cf04ea080ed SHA512 77787afa92e929a8ecba0ef3a0c22780c4ec14a0ff70d8c8fa2cc9368b62f0ec0e97a91015f6222d0203ccb9fa10a25cd1d13a7429842ebf9c121d36af1bcff0
 EBUILD calibre-4.12.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
 EBUILD calibre-4.15.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
+EBUILD calibre-4.16.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
 EBUILD calibre-4.9.1-r2.ebuild 8584 BLAKE2B 9e4061e96e543b69260fa51e7408468ff6529a8276782e166830f4266a4b58e481e01ec761ba5e4a7b25ac5cdcb1e2cd7955926392368cb341da6a51353b3d23 SHA512 4a89fbc43197765fa47070537eed2663f6bceaf3f0ac9ec51b46aaba1b12b6a341d446dc8a094f6df08fddc968de191da8af57c5c767ae861adad4563d572047
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.16.0.ebuild b/app-text/calibre/calibre-4.16.0.ebuild
new file mode 100644
index 000000000000..0191479d6be6
--- /dev/null
+++ b/app-text/calibre/calibre-4.16.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index b6fe85045704..fda0b36d3c1c 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1572 BLAKE2B 5ae9269816ee805d8aa8da09f9f024c8e7cd0bd20c70d4994a17066ca27f6895a1594757e44a09dc4b0251082554a7b6e5aa206ecd0a9c2e4d42912d193cbcac SHA512 9f9a4553439927685d07b5f117fa20d5ab825bfd69663025d94b1ee482edb2a033746f7a49b36410c880bd1eb94d0654a75e7db373caf5a101f5b843858d9aec
+EBUILD docbook2X-0.8.8-r4.ebuild 1571 BLAKE2B dcaaebf204fa7b78f5ad4e8771e7250f983ec9bf36c074328fcf79e56f0e92f6ec002ce74c4195d994a0c1d880595f9cea47c732e835c950f170441f9cfef357 SHA512 6feb7f3dea59afc91e7c145d8001cc588a142eabde16e12ff25776c6b2b3d7fa12cc77a37246b55fababb76edaea49d9b9737202d4e5909da785e56ae167d900
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 261929e07dfb..21d062586458 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index f0b7813c9bac..d0142b85c323 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,6 @@
+AUX libetonyek-0.1.9-boost-1.73.patch 304 BLAKE2B c9b18c3dac65284f53be3d686316bf6ecdab62b3d7a82cb4af41d528519e19cc65a0d5a97ac69a032d7305b38361ef0f47c7c1d2a0cf9098fffe6e1b3d818c3a SHA512 be2c53cd0902c3f51b0ba39b5b07177f3fc0978321fe6094baccdd8937b91de1aacf3cb77b1afe14840709712eb24d618e7474f58bb9baccdabe218eff7e7a9f
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.9-r1.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
+EBUILD libetonyek-0.1.9-r1.ebuild 1409 BLAKE2B a05ac72f4d9911fa4bccba9cfa49b4dcea278b09764610c33d57c97392a94985a404b9ce9ca94f889ac6885e0ea836d85bfeb7585bdb2ee4b2a573348381c32d SHA512 124efb8b14c6695024f7fbe724d01d222b2edb6a2aaddaa83d23d14d907ff228a446310af2c0e04f7d8186bf9bbc5fed087101fc3452b76f1fdc417a6c7a915c
 EBUILD libetonyek-0.1.9.ebuild 1213 BLAKE2B dd541c95dc2422f4c0461627b79f27e053bc4616223cd924c545f26a9af8b2e5fba66f6aed8a30d61885adc7d00524511c55eae725463f091385a801e2959fc3 SHA512 f79eef907d1889f71a6c3377a3452c626758301e288addb84dd866df8d0b672214f3bd400598aa9f4037f8ae16bac54722008be056ee2611eaccc20e653b6ae9
 EBUILD libetonyek-9999.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch b/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
new file mode 100644
index 000000000000..2992f9f1add3
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.9-boost-1.73.patch
@@ -0,0 +1,12 @@
+diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
+index 6dc0e9a..6f8e79e 100644
+--- a/src/lib/NUM3Parser.cpp
++++ b/src/lib/NUM3Parser.cpp
+@@ -7,6 +7,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include <algorithm>
+ #include <functional>
+ 
+ #include "NUM3Parser.h"
\ No newline at end of file
diff --git a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
index 63aab3eb452b..43f51e4a6e2d 100644
--- a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.73.patch" ) # bug 722042
+
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 85d74b593d4e..5d4cd84d993a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,11 +3,12 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
+AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
 DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
 DIST poppler-0.87.0.tar.xz 1595088 BLAKE2B 7bce4426b057ae8702399f0f3581ee844df89b01151dff9212e1d2c525847eba7614697ef02cc7278930b5e266e15f62d3b7c5d989951d44c62ee3f8fb9b2835 SHA512 4bdc432c75106b3f37643bfd57c66aba659864fdc3c4d9ffa5089ceaa33ad3bd10d2c4abfb09a4f7b9d7d137e31eb559b440d7df53f35f60d70eaef05f987630
 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
 EBUILD poppler-0.85.0.ebuild 3354 BLAKE2B 4302a00fdf67d9e6c31a245d3e896cc0bac0663249682efb44c3d307f5a00bb2f7b0195195d70531a784b9bc13dd3b0853c7a4e7189d7f04b2d5f7b572740bdb SHA512 b6f25ae17135528bd64dff6fb068d39026913b332410ec1b512834b339286205a5664564e8f8348e98678c81a4e00042b3e10cef4a70ec3525d91bd4bab2743a
 EBUILD poppler-0.87.0.ebuild 3363 BLAKE2B e9600b268bffbd857c8e0ac79087c61703ec0667126793ae069bb763f2aa3974f3b4b9b0b62b1fc4d323ec7bb7009fd788a948568c83b52f5c1f36ceb54bda63 SHA512 b30393fd43ed0ba92332874794a6ba64d89b88a7f82894571665389aa7a4aa347da663e70818ec6f0a2c56a6195b5e8b5aa179001e9ff9e4e043cb5a7332e227
-EBUILD poppler-0.88.0.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
+EBUILD poppler-0.88.0-r1.ebuild 3402 BLAKE2B bb0c35ed30750c133c420314c71deda56db4e6ed36fe6b34b6ca63a6b19ef2555e391259ca8ab2183bc037e6442037803affcb450edfe319b8e922613ae9e4ff SHA512 ed4d37ca6dbce3c82eaca43c33e2183220a080b97b889b9bc7a7dbeb5140981906d35214d5cbe99e00fed8e82cb6920e28d890740db21a32e046ce9087837df8
 EBUILD poppler-9999.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
new file mode 100644
index 000000000000..4f29727b6fcf
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
@@ -0,0 +1,30 @@
+From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 14 May 2020 00:22:33 +0200
+Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms
+ at all
+
+---
+ poppler/PDFDoc.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 572c77be..4b5621fc 100644
+--- a/poppler/PDFDoc.cc
++++ b/poppler/PDFDoc.cc
+@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector<FormFieldSigna
+ 
+ std::vector<FormFieldSignature*> PDFDoc::getSignatureFields()
+ {
+-//   const int num_pages = getNumPages();
+   std::vector<FormFieldSignature*> res;
+ 
+   const Form *f = catalog->getForm();
++  if (!f)
++      return res;
++
+   const int nRootFields = f->getNumFields();
+   for (int i = 0; i < nRootFields; ++i) {
+     FormField *ff = f->getRootField(i);
+-- 
+2.26.2
diff --git a/app-text/poppler/poppler-0.88.0.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild
similarity index 98%
rename from app-text/poppler/poppler-0.88.0.ebuild
rename to app-text/poppler/poppler-0.88.0-r1.ebuild
index 0cd5e76d8ec8..487596c917a4 100644
--- a/app-text/poppler/poppler-0.88.0.ebuild
+++ b/app-text/poppler/poppler-0.88.0-r1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-pdfsig-crash.patch"
 )
 
 src_prepare() {
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 49017175faf9..353e1740c652 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,8 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
+DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
 EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
-EBUILD recode-3.7_pre20140303.ebuild 1091 BLAKE2B 739577d9a5e38412363314897b1609e8b51b1aac977b4a337d6efecfeaa5ac9b87d60ba9b46e25f00de6ff209d5f5eabdb98f1d9f497e3ffb89ab91ded7d2df5 SHA512 f1952309d21129644556b4cf56d9ca9e0f75329cfab2e72205ea3a9055ec0d336100b92f069162753528aeb1ced995753d170cc96d8f2510ba87b58ab16ad9a4
+EBUILD recode-3.7.6.ebuild 995 BLAKE2B d20358b01c87073c6749500c53d6ca7ddae47fbb1a3ba6aa77aa2777d5547257a9f04117624b81ce267db1484b481ad6f8221a3a3bc2fcf247696a2d25234659 SHA512 289311a59f6ff5fe28c8b8b269d9103483b9ac8ad9b27e1ee8a932bfd34eba175bd3208ce8bcc0fa4a9aa10924ea734a802d28b888a7ae963976f25d33233098
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7.6.ebuild
similarity index 77%
rename from app-text/recode/recode-3.7_pre20140303.ebuild
rename to app-text/recode/recode-3.7.6.ebuild
index 3de99c002b05..cdbdbc5bc6d3 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7.6.ebuild
@@ -1,28 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool toolchain-funcs
 
 DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="https://github.com/rrthomas/recode"
-REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
-SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~x86-solaris"
 IUSE="nls static-libs"
 
-DEPEND="
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/Recode-${REV}"
-
-# tests fail.
-RESTRICT="test"
+DEPEND="sys-devel/flex"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
 
 src_configure() {
 	tc-export CC LD
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 303c0745ba9d..84c0bcaa140b 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 852e42f03c14..b1229213899e 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,7 +1,8 @@
+AUX nlohmann_json-3.7.3-gcc-10.patch 4668 BLAKE2B 6c70c34ce5df904ed641d021c8584cf69115f7b9434d5c43c283425e7eabbe40a21f06130b36ac1681302c9498ee0570ce396f82cb9258d5bef36ed7362f526f SHA512 ece8cea0e2aa217df1915df1de138db03320b15220d725bce4cf77282b5aa71952472594066c921efd6aa8a51ad0e2b1b22e83cfa89563f211d1225190a267af
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d
 DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865
 EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
 EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
-EBUILD nlohmann_json-3.7.3.ebuild 802 BLAKE2B 65b708379f74507c31d064f1763d9e9f8a9c4d9d8cd0918b34659218da78803882bb83cafc005dec0654af3213a5e97ad12aefab29bf946d495616d5c98c05d5 SHA512 632c2e8a74ce19bfd7836f2e942a24b91fb44942eac3cdf2fba8a49cf816e3b5e07a2e25bc02679faa0f6d2d7679256264b3b50dc5cffa4087d30a3a0735817b
+EBUILD nlohmann_json-3.7.3.ebuild 855 BLAKE2B 6342aa0db8f63ed9dde230ef134abc88a1259a4aba2ed1ee666d81cc394b832f79bb5877f1233feddbccafeb121bda27643cda58fbb65f6ed9bbdf5fdc805695 SHA512 ecef01faf88748f0b8629a2d2f9e3580c18eb0ce9ef9ce11632f7852435e0c313596d014d9e91dae090956a07bca0a996cfeaf8533051a2a5eb89acdf767d2ae
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
new file mode 100644
index 000000000000..1cdb6d594eca
--- /dev/null
+++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch
@@ -0,0 +1,131 @@
+From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
+Date: Sun, 12 Apr 2020 22:32:39 +0300
+Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref
+
+---
+ include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++
+ include/nlohmann/json.hpp                    |  8 ++++----
+ single_include/nlohmann/json.hpp             | 21 ++++++++++++++++----
+ 3 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
+index 280f69534..dd0b3084f 100644
+--- a/include/nlohmann/detail/meta/type_traits.hpp
++++ b/include/nlohmann/detail/meta/type_traits.hpp
+@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {};
+ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+ 
++//////////////////////
++// jspn_ref helpers //
++//////////////////////
++
++template <typename>
++class json_ref;
++
++template<typename>
++struct is_json_ref : std::false_type {};
++
++template <typename T>
++struct is_json_ref<json_ref<T>> : std::true_type {};
++
+ //////////////////////////
+ // aliases for detected //
+ //////////////////////////
+diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
+index 336d69fe7..0598efc8c 100644
+--- a/include/nlohmann/json.hpp
++++ b/include/nlohmann/json.hpp
+@@ -1773,10 +1773,10 @@ class basic_json
+     // other constructors and destructor //
+     ///////////////////////////////////////
+ 
+-    /// @private
+-    basic_json(const detail::json_ref<basic_json>& ref)
+-        : basic_json(ref.moved_or_copied())
+-    {}
++    template <typename JsonRef,
++              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
++                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
++    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+ 
+     /*!
+     @brief copy constructor
+diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
+index 09464f3b2..8927180e6 100644
+--- a/single_include/nlohmann/json.hpp
++++ b/single_include/nlohmann/json.hpp
+@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {};
+ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+ 
++//////////////////////
++// jspn_ref helpers //
++//////////////////////
++
++template <typename>
++class json_ref;
++
++template<typename>
++struct is_json_ref : std::false_type {};
++
++template <typename T>
++struct is_json_ref<json_ref<T>> : std::true_type {};
++
+ //////////////////////////
+ // aliases for detected //
+ //////////////////////////
+@@ -16632,10 +16645,10 @@ class basic_json
+     // other constructors and destructor //
+     ///////////////////////////////////////
+ 
+-    /// @private
+-    basic_json(const detail::json_ref<basic_json>& ref)
+-        : basic_json(ref.moved_or_copied())
+-    {}
++    template <typename JsonRef,
++              detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
++                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
++    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+ 
+     /*!
+     @brief copy constructor
+
+From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com>
+Date: Sun, 12 Apr 2020 23:42:26 +0300
+Subject: [PATCH 2/2] typo fix
+
+---
+ include/nlohmann/detail/meta/type_traits.hpp | 2 +-
+ single_include/nlohmann/json.hpp             | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp
+index dd0b3084f..13e92cb48 100644
+--- a/include/nlohmann/detail/meta/type_traits.hpp
++++ b/include/nlohmann/detail/meta/type_traits.hpp
+@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+ 
+ //////////////////////
+-// jspn_ref helpers //
++// json_ref helpers //
+ //////////////////////
+ 
+ template <typename>
+diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
+index 8927180e6..294e7509b 100644
+--- a/single_include/nlohmann/json.hpp
++++ b/single_include/nlohmann/json.hpp
+@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+ 
+ //////////////////////
+-// jspn_ref helpers //
++// json_ref helpers //
+ //////////////////////
+ 
+ template <typename>
+
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
index 7a43019627da..c99fd51237eb 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
@@ -21,6 +21,10 @@ DOCS=( ChangeLog.md README.md )
 
 S=${WORKDIR}/json-${PV}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.3-gcc-10.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DJSON_BuildTests=$(usex test)
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d2b53e90bfae..9a3969c18d47 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 47c89b13dce7..4d280cb139c7 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -18,7 +18,7 @@ DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf29
 EBUILD mysql-5.6.45-r2.ebuild 27033 BLAKE2B d1d7621c9b9535776e8acafa7a0a13923bfa19b28923a376769cb83f4d824913d192482efc8358549974ad454a036e480b695e584d45c90614ef82cb2682a3c0 SHA512 ba2d27d934f207fa9073946d650d0a709b491141f98410342d9491002cde51866126125b41356d86ba8387474f1a9c28ee6eff8d156e56828d3f67bbf10d6dd8
 EBUILD mysql-5.7.27-r1.ebuild 31684 BLAKE2B 9ff6937c77124bc8b6a01f6b56f23941599a517b1d89519045ede1c67312c78e594ece5ad0a0ce3fa2b93594dc6eaf811a85867e1c6a29c4e931f6b1c7000429 SHA512 725c6023e23d8341cc474b29c5929d920795abaa2d7d0af995eacbd4d7f8fef20bf054226f3756960e1be7f45c87242f331aa70add9af3cd43501b7dc9189148
 EBUILD mysql-5.7.29.ebuild 31420 BLAKE2B 7afa9f1af981304087cd0c1d6fbddf3031b1b0b9493e528acbc6befbf32432934a4920d6345a4ff18d3ea7973da0233d278f104295c75d232be3353960eb3922 SHA512 80a092af7eb3633973edf413ab07de355bc928648b7f42e89fc432e4143d3afcd34aec83f64329587ff4988a8d301006f43a32b1e3a2096c397e97be92b838e1
-EBUILD mysql-5.7.30.ebuild 30435 BLAKE2B facf1f861724cd3f97ffdf2a12d1338f05bad119d44014d39d76b659b4d113374175f0f9370f44e04e1cfa766ac765b0f059010c3cb74b08f9130e2bef5698a1 SHA512 1341a41fb5018c95e80f3d748c590a7159ab2bc1ab3896b1c9661b6c2598a665283170df3d584268647aa776ad0d4f810d74850bc99e37ed98c6d48d93050c9e
+EBUILD mysql-5.7.30.ebuild 30434 BLAKE2B 054987d9bf5e8f13c88e177e49a6d923cc3f0b66b0a0036a22e26545a2e8fa1bba8be56e4e3219b7380db1a72dfdc4dd36bea1aa076c17addb0109bacc929440 SHA512 2027f3640624607c99e7791120309c622506239c8b2cfa85e01d50da482bda5fe7db00068dacf314cfaa54fb3b871ffd7bd276a249191b903c34d00fae3f3e7a
 EBUILD mysql-8.0.19-r1.ebuild 36962 BLAKE2B e7f3d084bbc61e6ef205c136016d3ac46c5f82925a964eb04e4f2b1ea3c1748a86d40a02602a3ab5b49428ff213e98a28fac415987ce51d9329e4f984c820b03 SHA512 7c3628de6bf1fae99d6593e73b52203fba1d4482048c076d798755cb1c66197d5d0c921539252cc10fc733925b2c8dbd349039a5b1b295b4ebbf1147bcc1c360
-EBUILD mysql-8.0.20.ebuild 36231 BLAKE2B 2dbaecd485842582e4d680815d92b90666fea0193e33de1c7d55c278f009cc1d5dd13715ccc65a7052ff9fced379b55e6c4033cbb3663f48ff4c16c0ddb1f1c9 SHA512 c2d30efd25f86a11f7df8723293e639cd5673e9c3f0d974facacedf4bd09d0b9b3b3c92c7fc3791c2631559a9efdff265b23391e9a12d0e0671ad4495d1daeac
+EBUILD mysql-8.0.20.ebuild 36230 BLAKE2B 0f04776a91e4f1a04ccf8666bfa828f6179e90852d2d9634e852d4f424b5b87b72c77460133f407cdff2284fed175e035641ed498eacdce3040f04692b44424d SHA512 99f866235300e703b38027c8909570026715be16139abd96075ace9b4e9f3a30c6275e98823f5f681b56dc6c15af2404879b0dcb1df9d31ed236322b7a675e8d
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild
index fab0a6937cb6..4543221a9e40 100644
--- a/dev-db/mysql/mysql-5.7.30.ebuild
+++ b/dev-db/mysql/mysql-5.7.30.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.20.ebuild b/dev-db/mysql/mysql-8.0.20.ebuild
index 7a1ea0b39205..d2f81739cca2 100644
--- a/dev-db/mysql/mysql-8.0.20.ebuild
+++ b/dev-db/mysql/mysql-8.0.20.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d847a633ff76..e9a053812aa7 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -11,16 +11,26 @@ AUX postgresql.service-9.2 1666 BLAKE2B d4b81415539db3d78e0f5908185f903b70966ce3
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
 DIST postgresql-10.12.tar.bz2 19020488 BLAKE2B 2177e9b63e21a634e1d8ea060b5bd0a7360d81ece64f50dd614e6cdd6b0cf0dcbd3896ef2c11bd1431ce7a964ac8876d24f368d7f7eb309e3d432856d7546f2a SHA512 6accc66cbbae811509095c33e8a8d17ddd11d9e307267312e3d09df90469db4700a5806166d66f25d77769d3ef88653c98dfc7d05dd053f10434b03e0a9e33b7
+DIST postgresql-10.13.tar.bz2 19028339 BLAKE2B 8adb1be902863778ca6a0396f1bc3ffa3e69b9e27bd830523472f4895e225831ba98716c07dc3f8dcab68623d434fc3d2d7b71f753f4105c69ecb05365c94789 SHA512 7b268aa4476ed9b168814891e8b19d182683ab4994d4a9b30e75eec93ffd9c860f8a0979ba1b7408acf8e217437b5cc20037b6ebf6ef01e9cf5ee99f091c8c92
 DIST postgresql-11.7.tar.bz2 19890063 BLAKE2B 461c372567ff0b4ff4da52889be5d2822b56889e4890b33c9a71f1105ad629b4f5bec95c4fbf5aebbdd4445e0ff451a7d8df04ae7b5bf7cf0075c3226a41b19b SHA512 32c7ace228f9895241ce0d925fbfc60c0cd39f4cd35368fb10dc7db046151ffd59a9895b4c30a529627f0103051e84b4992ed60312cccd292489f3037076ca1e
+DIST postgresql-11.8.tar.bz2 19922770 BLAKE2B a646b585bbafc95957fa60c7d119c02b69b727759d2189588508f8a690dc97a0ed1429a3379bc6fd48fb22ee92f3d811dedbf8aa43271361f9b7ac2c8d42a31b SHA512 fc3d0ebd224de60bda3fa71b6832958698238e9088cf46a80c376b8996cc3b2d017fde5dce1c1da1e5e6e23b78054aafad7ee1caa744bfb12c52317ccc8a1922
 DIST postgresql-12.2.tar.bz2 20363545 BLAKE2B 7b0cfe841d46b117ff5dd793be5537e916f92255eb0d000681ed62c497eef34c5d1261126be408f2b7f95274485e2787869cd4063461ab248b650c168b62548d SHA512 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
+DIST postgresql-12.3.tar.bz2 20439892 BLAKE2B f7a44725f235c55a2849acd444de3a9c932314e2ae8c68d7f8e827439263b052bdf0fd5b6cdaa8197c4ce9ad1d4fbb02b5ec1af030365363993a36d8d95a4231 SHA512 68e2d244ae2a9f2138d7569bcadc1cf6f62a410fa56ad1d4ac53206f2adefabb5ae136110b41ca9246df0f8b8cb039918997e0f8a81fc7e6efb7ad10b3a59ba1
 DIST postgresql-9.4.26.tar.bz2 16871195 BLAKE2B f26fd335293669a815a51ceb994b66e154c66f96f91e4c68d7df3490ad25f4b0366ebf7bfe2b209ff34965ea27a08562ace050f40d49cec94eb576d7a1becd1c SHA512 7d379d139c7b2bdac1df38743cbb46a1790a8d5174e8cf1141b7b4febcbc8f612e347bf4d355684eef24dfc73bb2796f85fc532908f26ba7195c685f198cbb72
 DIST postgresql-9.5.21.tar.bz2 17640928 BLAKE2B 8ffcf0befc331317a32d63d3cdfe44f7743f72f18b4bc46bee5ee80f8c489b4b1ef26abc8219f277acc922657fc21e3dc31f3fc9838621f44d95cc9405fca43b SHA512 8527356ee3b4f151c832aef50a8b96e923e0a6c77e5fe6ad597f50527f9d084a8feab7bede8fdbe29aab44383577d3f86e5286fb34e2d2b696cde34bd922e69d
+DIST postgresql-9.5.22.tar.bz2 17667386 BLAKE2B 6fe8ccf638af466e57f239c9d7f1a19bb6c33f6019955824f54f2fe63870675d841811318fb28707cc85ab8a9db550e6655773db0d89d801e26459c9d0d01a43 SHA512 489321fa49e17308d3a78353edf73a16295c1377ad429a94636df069d2bf55f538ba6570e3d2991dd28bcca45fee77c6c41fa9bade35ea7f9e581abff4c9a401
 DIST postgresql-9.6.17.tar.bz2 18812282 BLAKE2B 0bb48445201aae1d6b4f5a77652aefaaa629799a019c3b81a14e554a88167530002931c2b0d658731b26a38bd09487f79a6ef514b0955982d6037b383c021819 SHA512 a76f328523517f664e4fc59a4d27e476bc6300e49370712030caae40aa160acb1e6aecc7cd3b3440125713069932df812eb8d75377a3df63e59c9292419c2aa8
+DIST postgresql-9.6.18.tar.bz2 18836490 BLAKE2B 43f2d8a14e4fcad72af1f2e2814546368f7c2c0bb3c9957527e96df0ae6984d6b05008619855cf74fefeab0f35b13de4f0a437f79fa13c6e3a4ca2c8bc272aab SHA512 78aad7042d22be4486511a9f3b5df2578b65a911b9e969e6196c945d84b9d9a79b40c01a8bdd3859cc67cd9a5d023cca5d83c1360cb14a9bb076ff3b5c1fff70
 EBUILD postgresql-10.12.ebuild 13833 BLAKE2B c255fd95d1948451496a85e44ab1853697a6d5adc6d85e442e2589acd21880c00b7e9b1ad31ad3a8a53ed33935b56e0ae418035521773ed2bd82c8380bac6204 SHA512 14a1e4cb181ded8e6689b4c3adf3717c8ae259284863dc676874244a1928af5ea5559243d27dd9d271b433dada172fa75368eaddc218c1a12786dedac79240c7
+EBUILD postgresql-10.13.ebuild 13543 BLAKE2B cde9c3b3b834de3c034afb6a3e34091ff1965be756c69d498ea2f0edc8ec10268594e4769aefa32c1f6a9399733778b41034190b43e9ee86990dbdb591a88fc3 SHA512 ecc51aaf49b83a3a526fd77e6bbc166b1309b33102d1f7c80cc069699f8114798fa267e6c1bdd6ee6c8830979abb13e8f07a133c9b7b3ad046a217db96a29977
 EBUILD postgresql-11.7.ebuild 13960 BLAKE2B ac5f232278ecfc2d832089b0707f69665fd96a9db916a06e72d75151b906d6d593e78f4348437da9cadd8a7b822707b1c2ad26774317287fa01abae4ec76adb8 SHA512 656589314ae0f79586e1f2cdbc12511f8e5bd29cb726706fd22ac6d1df7500b713488b344feb150f7ea2aadec690756fcea2b9f3637fdd9871a26c58799e1106
+EBUILD postgresql-11.8.ebuild 13670 BLAKE2B 33dd9a2b70beb9d546d863f4e1e09e51a54e69596f7944956cf34f9dbe074dbe8b3984ee060e7a9dc266a08c506ef1a1c781bb9499a2a2deb124628b52b82514 SHA512 a19e54b87320832867d87def70c0eb013d4806c4ea1a98c16cc0541cce805506b876a30dfdba75bdac075912a15b8ff1012c661111f9dd0b81bf35be846f2054
 EBUILD postgresql-12.2.ebuild 13932 BLAKE2B 8c1819ee06822a77a149cc69f9749ae0163cb2408f237eb241d26f99e7f2873002be1b89fd54f0f977f34812f39bf3fcdcc280880b5bfd140867e094df1c61e9 SHA512 f1490ef4217484bf337637dad1d34affab95657d5160e5c6a1e8d403fc9618a84cc0593fbe4842711b539c7b2ebea41f95806ad15909b95b67587967ba178180
-EBUILD postgresql-9.4.26.ebuild 14434 BLAKE2B 580507e33bebd4f3de486bfe2d42b6967ff151d8f22b988df1b14f0ab58a1a24b73453519e51a97d5d0ebabb2cd102ad56da351186c1883080a22d717471caad SHA512 50e4a6c3851a0f2b4ef16affcc740058d42201054505416935d55b21f3ca19e6cc3a25e15937f992a327e5836d48a9e1365c0917e55d12aab61bf37115b5df2c
-EBUILD postgresql-9.5.21.ebuild 14655 BLAKE2B 8505dcafc0aa6a0d3b117f9970eae034cef29258476c30a9bcc36553854570d2436d5c9c0f682f2587aff667450433749cc1eb102af1c5e65b1c58d4ef14e634 SHA512 ce02b47d341aa7102b643310a9effdef2701f9554b683bb09ffde52567baf20b64b10e9cab1ad7480b6804d78cd2089f950ab2462dd18e2bc1938f912775c8f5
-EBUILD postgresql-9.6.17.ebuild 14888 BLAKE2B 1abd6b1f1e1281f3ef0f9cd00aacd6122efa9122f671299a43d6185dacabd0169f6aed87dcd3d96bc2bcfe155253a6332391a9ec8863e9f05935e41a0e9012e8 SHA512 660409283c196fa0e53ebe3e2f96cd680d2025071d134dc0dca33cd9501baf7ef211f85ace18919b2a122ee13b9aeb857de74d2b6290979dfc731a3e1a26e120
-EBUILD postgresql-9999.ebuild 14401 BLAKE2B a660542da171012b67ad0c7fe61135d1a4357fca8c7fdba2c51d1149b758d27ad0efc2250bb95d4fc0399f2c78449cea9cdd0cae8f983dcc5881a9896e4571df SHA512 33fab6f657b833451d54230fa2c9c20604ab7b7a55667021390debb1d78acf98f017a971392decc7e5551df5d545cde4f3d421e6d1a5c061a19d078f5f0a28ed
-MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
+EBUILD postgresql-12.3.ebuild 13642 BLAKE2B 0c6e9465fe2d8b8ca2d1f22cbcc3c27b2bf31e563e4fc73242f5bcd62f41811252ef4c41506802b051cc8c146086b5653aa3fc7a229ff9ff7463ce721eebf147 SHA512 893dc2a1d2e30c01706c2ecc0a4dba4dfeaf9c72765cc6c73a18fb4559a6d9e46c6fe653d5c8e94c041e36881febf7f20f6d7895cb1f63bb816c5f9d89604da1
+EBUILD postgresql-9.4.26.ebuild 14434 BLAKE2B 7b3953845d43f0bcf33f4839c45679f62804b9360d7ca956a36014a9e745eee81e026f7d1e51bd41259f81d77b48540ab1e6c2309fe78fcd48b7bf10625a762b SHA512 c377a08cdfa25edc1090890052c73f614ea976c6ef89dc65ea953e39b17024c51b0484275a9e7d7dcdaafa3f14bd867ac0177f43ee05aba449235bc75baa4617
+EBUILD postgresql-9.5.21.ebuild 14655 BLAKE2B cf7d690e04b4ea1f291592214673aa41af62b75fe033b47b5f5a15e134e0adb4b6610156af57a255f3cca375f9749e3694cadb1b882089909ad8326a0a4ffa15 SHA512 d92da5ad29a1490a42f82b7ebdb7eef63763bcecd4730d4f9532a80eb39a0244a2d345f6450b0b0c68f1792f31af910c1e7b4082007e969d60aa4d15af0a050d
+EBUILD postgresql-9.5.22.ebuild 14364 BLAKE2B dca6b5544443ae23804383318c78ccad2cd2f4893576ddfa9884c7dc3c8934958599b3e9384e380173cb5b93808763e4e18fd0f6c3831c8f4ab46e49e6d87c12 SHA512 a21309712520216d545ce9e57939a86012bda865586e9684ded29febf2e7c79458ddbc601c29365324fb5363ac506a801f208925ac88f90bc998306d032b5f72
+EBUILD postgresql-9.6.17.ebuild 14888 BLAKE2B 673996dddde1ce63a20d1b444e49982fb070ba8701caa9e452c3e068460b3bf44b810f19d552f2bd6e721499a08f2ae2e93001c2fb5837f6077852d0ca42e59e SHA512 1abd26b230e345ebf491333e6594c232e2fd8d9ef26acafbd148bf5d088c4332dfeffec66ba1d58fe6809dbb7cf0d2bbe47bd005024e1270e3ad2db8b994cce6
+EBUILD postgresql-9.6.18.ebuild 14597 BLAKE2B 15c5ea6f83c7b92c560e0077a73da7ee7a2fabf98b42a4501ff459ee368dd048ef8b4174c6de88e7149532960b007df415a24678f93b45717e70c5e4b4c825e9 SHA512 f79341c17fb27f09bd369c0a6022a2874a70638bcb35c24d50001d3311d8f3f6d61c0f11dcb3a9c92fca4772fd0c03521a6190fc5d04e61164b360ecaa126cfd
+EBUILD postgresql-9999.ebuild 13812 BLAKE2B f0eb8f0d79c3d4d9f0bdd0fe49f9b8354ce0bbd237b286e1509b9d9573cb6c023a855c10c97d836909495a0e23fc785716820e6e54e86b0f31765e0aef53a645 SHA512 3e56a9b619e4a94658035121d71a5e86c115f7dd3a13318ff0b6c341b59ad0cb836376b7f0074a3e28e7b17f93c3e2b9317a6662de19f77d6f6c4e6b4bc1066b
+MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/metadata.xml b/dev-db/postgresql/metadata.xml
index e263f5e30d71..02d49bed2548 100644
--- a/dev-db/postgresql/metadata.xml
+++ b/dev-db/postgresql/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="llvm">
 			Add support for llvm JIT engine
 		</flag>
-		<flag name="pg_legacytimestamp">
+		<flag name="pg-legacytimestamp">
 			Use double precision floating-point numbers instead of
 			64-bit integers for timestamp storage.
 		</flag>
diff --git a/dev-db/postgresql/postgresql-10.13.ebuild b/dev-db/postgresql/postgresql-10.13.ebuild
new file mode 100644
index 000000000000..54610ae9a34e
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.13.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl nls pam perl
+	  python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-11.8.ebuild b/dev-db/postgresql/postgresql-11.8.ebuild
new file mode 100644
index 000000000000..fadb6959719b
--- /dev/null
+++ b/dev-db/postgresql/postgresql-11.8.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+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=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-12.3.ebuild b/dev-db/postgresql/postgresql-12.3.ebuild
new file mode 100644
index 000000000000..e0a0549f88af
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12.3.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+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=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.4.26.ebuild b/dev-db/postgresql/postgresql-9.4.26.ebuild
index 32bc19186d1e..c662926d91f3 100644
--- a/dev-db/postgresql/postgresql-9.4.26.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.26.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
-	  -pg_legacytimestamp python +readline selinux +server systemd ssl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -147,7 +147,7 @@ src_configure() {
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
 		$(use_enable debug) \
 		$(use_enable threads thread-safety) \
 		$(use_with kerberos gssapi) \
diff --git a/dev-db/postgresql/postgresql-9.5.21.ebuild b/dev-db/postgresql/postgresql-9.5.21.ebuild
index 00537608230f..11de5150b264 100644
--- a/dev-db/postgresql/postgresql-9.5.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.21.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
-	  -pg_legacytimestamp python +readline selinux +server systemd ssl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -148,7 +148,7 @@ src_configure() {
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
 		$(use_enable !alpha spinlocks) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
 		$(use_enable debug) \
 		$(use_enable threads thread-safety) \
 		$(use_with kerberos gssapi) \
diff --git a/dev-db/postgresql/postgresql-9.5.22.ebuild b/dev-db/postgresql/postgresql-9.5.22.ebuild
new file mode 100644
index 000000000000..7d999e9628af
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5.22.ebuild
@@ -0,0 +1,476 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1-2)
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-9.5.5-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.2" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	if use alpha && use server ; then
+		ewarn "PostgreSQL 9.5+ no longer has native spinlock support on Alpha platforms."
+		ewarn "As a result, performance will be extremely degraded."
+	fi
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.6.17.ebuild b/dev-db/postgresql/postgresql-9.6.17.ebuild
index db31e5a8233d..cc62ab8a0c1a 100644
--- a/dev-db/postgresql/postgresql-9.6.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.17.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
-	  -pg_legacytimestamp python +readline selinux +server systemd ssl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -152,7 +152,7 @@ src_configure() {
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
 		$(use_enable !alpha spinlocks) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
 		$(use_enable debug) \
 		$(use_enable threads thread-safety) \
 		$(use_with kerberos gssapi) \
diff --git a/dev-db/postgresql/postgresql-9.6.18.ebuild b/dev-db/postgresql/postgresql-9.6.18.ebuild
new file mode 100644
index 000000000000..52f63bca1fbc
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6.18.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+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=$(ver_cut 1-2)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap libressl nls pam perl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+server? ( systemd? ( sys-apps/systemd ) )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 200ad41f243e..1ca6f1f03d09 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -5,17 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
-		 zh_TW"
-PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt-BR ro ru sk sl sv tr zh-CN
-		 zh-TW"
 inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \
-		systemd user
+		systemd
 
 KEYWORDS=""
 
-# Bump when rc released.
-SLOT="13"
+SLOT="9999"
 
 EGIT_REPO_URI="https://git.postgresql.org/git/postgresql.git"
 
@@ -24,16 +19,15 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug icu kerberos kernel_linux ldap libressl llvm nls pam perl
-	  python +readline selinux systemd ssl static-libs tcl threads uuid
-	  xml zlib"
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
+	  python +readline selinux server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="
 >=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
 sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
@@ -82,7 +76,6 @@ uuid? (
 )"
 
 DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
 >=dev-lang/perl-5.8
 app-text/docbook-dsssl-stylesheets
 app-text/docbook-sgml-dtd:4.2
@@ -97,35 +90,24 @@ nls? ( sys-devel/gettext )
 xml? ( virtual/pkgconfig )
 "
 RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
 selinux? ( sec-policy/selinux-postgresql )
 "
 
-my_get_locales() {
-	local my_locale locale_list
-	for my_locale in ${PLOCALES[@]}; do
-		use l10n_${my_locale} && locale_list+=( ${my_locale} )
-	done
-	echo -n ${locale_list[@]}
-}
-
 pkg_pretend() {
-	ewarn "You are using a live ebuild that uses the current source code as it is"
-	ewarn "available from PostgreSQL's Git repository at emerge time. Given such,"
-	ewarn "the GNU Makefiles may be altered by upstream without notice and the"
-	ewarn "documentation for this live version is not readily available"
-	ewarn "online. Ergo, the ebuild maintainers will not support building a"
-	ewarn "client-only and/or document-free version."
+	if ! use server; then
+		elog "You are using a live ebuild that uses the current source code as it is"
+		elog "available from PostgreSQL's Git repository at emerge time. Given such,"
+		elog "the GNU Makefiles may be altered by upstream without notice and the"
+		elog "documentation for this live version is not readily available"
+		elog "online. Ergo, the ebuild maintainers will not support building a"
+		elog "client-only and/or document-free version."
+		ewarn "Building server anyway."
+	fi
 }
 
 pkg_setup() {
 	CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
 	use python && python-single-r1_pkg_setup
 }
 
@@ -180,7 +162,7 @@ src_configure() {
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
 		$(use_enable !alpha spinlocks) \
 		$(use_enable debug) \
-		$(use_enable nls nls "'$(my_get_locales)'") \
+		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
 		$(use_with icu) \
 		$(use_with kerberos gssapi) \
@@ -206,7 +188,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install-world
 
-	dodoc README HISTORY doc/{TODO,bug.template}
+	dodoc README HISTORY doc/TODO
 
 	insinto /etc/postgresql-${SLOT}
 	newins src/bin/psql/psqlrc.sample psqlrc
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 1a4c2a3ff87c..4003c72c6a85 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -21,9 +21,11 @@ DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5
 DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311e22e186460834920babc35ff343d84e8cb78a2cee0d45d9ba1c01944c783c88892b6580d83bc1cdec64a3e94 SHA512 78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586
 DIST redis-5.0.7.tar.gz 1984203 BLAKE2B a4e65784ae5d673833d1a6df73800d95ca4d8db7ec045c166027d0c372291e2f5fa2ccc4fe8d4a081b7a967c154fcf03d4b097c5d7b05755a52b465e441ad7ee SHA512 75c1d4bcca3e28d80f6b6942f0153ff33538d706339c69bddd2646c36f88b901c77dde09fba5629ba90ace00077e45d37b0a822a863f9f737ef9a79eb7093d9d
 DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa71efa78dd50830e1bc1d83261f78ed6ff75b789b238709d9f72d5d401be2f2dd698bd19c41c091d10e0baf47 SHA512 106a74ab910267472fb418fdeb4f39e29efe9d73ed5af78b7847c91eaabd473dd729a63078e72d8e87c842169502946e9a0a97c42dea415db82732864c7c46dc
+DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
 EBUILD redis-4.0.2-r1.ebuild 3831 BLAKE2B aac2861849f335334acf0efec4277da58268ab76da7f1258c7a2da9c455411c07e0fed1c60873ce896ee95e6457f9f94ae0b7fa4035bc9bf7c3b5fa002671782 SHA512 e7728e0c6958d5ff2039513d919efea3d9edbf272f2e56aa5a6df9610079a5c70a3cefd1850894519042dec877c65775f7b04c02a8002aaf0d3dd5bed3e38c04
 EBUILD redis-5.0.5.ebuild 4643 BLAKE2B 97b14d1e266889a7cceef8ffc8e23ad64a45118a7845a404f13b0b40ce25bfe4298b3f9ade9679fb37958505a386ba4f60bfc28b4118fcb864148dc9e16206b5 SHA512 1371edf66967441555392448ccfe1671dad3535468160ec8797e480088c9b19b64ad0df9fd79fc5845ee180b2c58f8c7a0119f721c25e7c40424851ef31f49f1
 EBUILD redis-5.0.7.ebuild 4627 BLAKE2B 64de46492e9a087d38fb4ccba73c6685a8f9d5116b8689b4a9d31a0ada04aee282fa46c0fb184d884978aad2c0a9661c37b6338d350853fc444d03af0e8f3460 SHA512 2de0c542f5ea3be6e16cd556715c7a725178de1339c71732c39626a04b154244da97fb2e35258d15ef1214da60afd9fe8e7415480b98abb076a2795be4d8fb0b
 EBUILD redis-5.0.8.ebuild 4670 BLAKE2B 50c9fa61224453be6a8196121f82feb8c1a5896f66d57e2400235061bcf5767a8f89cef89020975b060af2ecebaf69a880dfb8e21ad6e4b3aedbe2d1771ae445 SHA512 d82e7f2408c47d5966d400c56846e07ea8b75e604b13afd7afcbec76e6d77d764945f9e3ab9d9a0569fb1fc4e59d34250733b9627e1dc0f4681e500606df4e13
+EBUILD redis-5.0.9.ebuild 4676 BLAKE2B 2de30fcbfb59d8b8fb75fe956d493f1ea7af8b6e5c9345a063722f5b85a31865d8acfad4cfd2b97dbe96e13f9734dc772a5b3c67eabf68239035721e6c0391b9 SHA512 ad8055de14691a842f160f0dfdd9530ed290417cca01f7e668fccece5433c18da26c153d20fd9df15ec58deaf56c6f7cc6aca83540fc6bd3e12c9bc2be27e43c
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-5.0.9.ebuild b/dev-db/redis/redis-5.0.9.ebuild
new file mode 100644
index 000000000000..c793b287dfc2
--- /dev/null
+++ b/dev-db/redis/redis-5.0.9.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+COMMON_DEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.3-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-5.0-sharedlua.patch
+	"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# Copy lua modules into build dir
+	cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua
+	if false && has_version 'dev-lang/lua:5.3'; then
+		# Lua5.3 gives:
+		#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+		LUAPKGCONFIG=lua5.3
+	elif false && has_version 'dev-lang/lua:5.2'; then
+		# Lua5.2 fails with:
+		# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+		# Because lua_open because lua_newstate in 5.2
+		LUAPKGCONFIG=lua5.2
+	elif has_version 'dev-lang/lua:5.1'; then
+		LUAPKGCONFIG=lua5.1
+	else
+		LUAPKGCONFIG=lua
+	fi
+	# The upstream configure script handles luajit specially, and is not
+	# effected by these changes.
+	einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r1" redis
+	newinitd "${FILESDIR}/redis.initd-5" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-3" redis.service
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 73d7f9be9d21..858eea63994e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,4 @@
 AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
-AUX sqlite-3.29.0-full_archive-build.patch 15915 BLAKE2B ccc439a441bede4d6b380cae77b97929d342a54f0fc3ee4ac000ca52b1d8d3d63a86e0d9c89dbf3f3a9235ed03ad51c29cbde27a6929e4fe25fb2304977affb9 SHA512 a551bd1c54a7fe7e1581c2682cc0a76f16a00d8513386d85d939ffd1494f29ee266fbe3bc97db74f72435616f30855d14b76dfd4e205c61c5c91c7af3eb97851
-AUX sqlite-3.29.0-full_archive-tests.patch 4122 BLAKE2B e41f62e1efa354c8b5dda6f79328384f0c19f40830e71268e2a3741961248db5c3ca6159deca9bd47983d8ca47ce0caf2fcc8b406cf2f1bc1ff21910fa51d9d6 SHA512 f8cf5f8fc6a53459187cec92823f0982d0d48d9f0b0ab75bcaf713f5486a40193578d187cbc7272371e868b95990a48c794efe300b18a63b9ae273cfcc2f8757
 AUX sqlite-3.31.0-full_archive-build.patch 15642 BLAKE2B c07992c52f1e67d5d5eae1b0cfc0fe20b26e4405ccd8f6c7ece75ea3908f9699e67520c3d27b614b01d20b5758b2b85a8f3b66aa1675cc8fd248d7742fc55ec9 SHA512 14727ab43911f810a22b3aa2a48ce8074422ad38898d0064b7ec4b9a226b27a781ac342a60f32ae1edbaae155bdf142456f66faf8d5adcd33b902b77c3607f72
 AUX sqlite-3.31.1-full_archive-architectures.patch 2993 BLAKE2B 252d92ec087482b062e0dae0b223e0c0dee6f5857765c6babb857922eb97183a1c72b4ba196685e6b1e1631990123bc8cd71a4e26eabe317741cdc19ac54c201 SHA512 d65475759e2ae663094803d7c74e62fe233630afcf7bd287e77a613144889efb09d57e9f9fa8dce634872e37f1ae53134793fbcfd3d7bd260fc6d774bf5e8aad
 AUX sqlite-3.31.1-full_archive-security_fixes.patch 5388 BLAKE2B c2740e47d2aab8b99c9d8ae9f346f51f0dca8cdff7d3b991346aff5e94553af1c523b48d33490abb83ecc77be9ae075580dc095b827b348c657b9d5082ec5fe3 SHA512 53894b3bdf5e4a61c58b23758867a63db73b49b856f696a32c6c6d0224d54359927db635abec770e84b111dbf0fbb48b9742809be05504e12854385c58024819
diff --git a/dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch
deleted file mode 100644
index 290d286e4892..000000000000
--- a/dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-Move some code to libsqlite3.so to avoid duplication.
-Link executables against libsqlite3.so.
-Increase timeout for fuzzcheck.
-Fix building with dlopen() not available.
-
---- /Makefile.in
-+++ /Makefile.in
-@@ -311,6 +311,9 @@
- # Source code for extensions
- #
- SRC += \
-+  $(TOP)/ext/expert/sqlite3expert.c \
-+  $(TOP)/ext/expert/sqlite3expert.h
-+SRC += \
-   $(TOP)/ext/fts1/fts1.c \
-   $(TOP)/ext/fts1/fts1.h \
-   $(TOP)/ext/fts1/fts1_hash.c \
-@@ -363,8 +366,12 @@
-   $(TOP)/ext/rbu/sqlite3rbu.h \
-   $(TOP)/ext/rbu/sqlite3rbu.c
- SRC += \
-+  $(TOP)/ext/misc/appendvfs.c \
-+  $(TOP)/ext/misc/dbdata.c \
-   $(TOP)/ext/misc/json1.c \
--  $(TOP)/ext/misc/stmt.c
-+  $(TOP)/ext/misc/sqlar.c \
-+  $(TOP)/ext/misc/stmt.c \
-+  $(TOP)/ext/misc/zipfile.c
- 
- # Generated source code files
- #
-@@ -435,7 +442,6 @@
- # Statically linked extensions
- #
- TESTSRC += \
--  $(TOP)/ext/expert/sqlite3expert.c \
-   $(TOP)/ext/expert/test_expert.c \
-   $(TOP)/ext/misc/amatch.c \
-   $(TOP)/ext/misc/carray.c \
-@@ -461,7 +467,6 @@
-   $(TOP)/ext/misc/totype.c \
-   $(TOP)/ext/misc/unionvtab.c \
-   $(TOP)/ext/misc/wholenumber.c \
--  $(TOP)/ext/misc/zipfile.c \
-   $(TOP)/ext/userauth/userauth.c
- 
- # Source code to the library files needed by the test fixture
-@@ -640,25 +645,25 @@
- 
- libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
- 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
--		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-+		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
- 		-rpath "$(TCLLIBDIR)" \
- 		-version-info "8:6:8" \
- 		-avoid-version
- 
--sqlite3$(TEXE):	shell.c sqlite3.c
--	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
--		shell.c sqlite3.c \
--		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+sqlite3$(TEXE):	shell.c libsqlite3.la
-+	$(LTLINK) $(READLINE_FLAGS) -o $@ \
-+		shell.c libsqlite3.la \
-+		$(LIBREADLINE)
- 
--sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
--	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
-+sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
- 
--dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
--	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
-+dbhash$(TEXE):	$(TOP)/tool/dbhash.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
- 
--scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
-+scrub$(TEXE):	$(TOP)/ext/misc/scrub.c libsqlite3.la
- 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
--		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
-+		$(TOP)/ext/misc/scrub.c libsqlite3.la
- 
- srcck1$(BEXE):	$(TOP)/tool/srcck1.c
- 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -768,7 +773,7 @@
- # Rule to build the amalgamation
- #
- sqlite3.lo:	sqlite3.c
--	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
-+	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
- 
- # Rules to build the LEMON compiler generator
- #
-@@ -1065,14 +1070,9 @@
- # Source files that go into making shell.c
- SHELL_SRC = \
- 	$(TOP)/src/shell.c.in \
--        $(TOP)/ext/misc/appendvfs.c \
- 	$(TOP)/ext/misc/shathree.c \
- 	$(TOP)/ext/misc/fileio.c \
- 	$(TOP)/ext/misc/completion.c \
--	$(TOP)/ext/misc/sqlar.c \
--	$(TOP)/ext/expert/sqlite3expert.c \
--	$(TOP)/ext/expert/sqlite3expert.h \
--	$(TOP)/ext/misc/zipfile.c \
- 	$(TOP)/ext/misc/memtrace.c \
-         $(TOP)/src/test_windirent.c
- 
-@@ -1240,15 +1240,15 @@
- 
- # Fuzz testing
- fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	./fuzzcheck$(TEXE) $(FUZZDATA)
-+	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
- 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
-+	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
- 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
--	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
-+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
- 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
- 
- # The veryquick.test TCL tests.
-@@ -1279,24 +1279,23 @@
- smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
- 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
- 
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
-+sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
- 
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
--	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
-+sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
-+	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
- 
--sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
-+sqltclsh.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
- 
--sqltclsh$(TEXE): sqltclsh.c
--	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
-+sqltclsh$(TEXE):	sqltclsh.c libsqlite3.la
-+	$(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
- 
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
--	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
-+sqlite3_expert$(TEXE):	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
-+	$(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
- 
- CHECKER_DEPS =\
-   $(TOP)/tool/mkccode.tcl \
--  sqlite3.c \
-   $(TOP)/src/tclsqlite.c \
-   $(TOP)/ext/repair/sqlite3_checker.tcl \
-   $(TOP)/ext/repair/checkindex.c \
-@@ -1307,36 +1306,36 @@
- sqlite3_checker.c:	$(CHECKER_DEPS)
- 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
- 
--sqlite3_checker$(TEXE):	sqlite3_checker.c
--	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
-+sqlite3_checker$(TEXE):	sqlite3_checker.c libsqlite3.la
-+	$(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
- 
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
-+dbdump$(TEXE):	$(TOP)/ext/misc/dbdump.c libsqlite3.la
- 	$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
--           $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
-+           $(TOP)/ext/misc/dbdump.c libsqlite3.la
- 
--dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
--	$(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
-+dbtotxt$(TEXE):	$(TOP)/tool/dbtotxt.c
-+	$(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c
- 
--showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
-+showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
- 
--showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
-+showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
- 
--showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
-+showjournal$(TEXE):	$(TOP)/tool/showjournal.c
-+	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
- 
--showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
-+showwal$(TEXE):	$(TOP)/tool/showwal.c
-+	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
- 
- showshm$(TEXE):	$(TOP)/tool/showshm.c
- 	$(LTLINK) -o $@ $(TOP)/tool/showshm.c
- 
--index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
--	$(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
-+index_usage$(TEXE):	$(TOP)/tool/index_usage.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la
- 
--changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
--	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
-+changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
-+	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
- 
- changesetfuzz$(TEXE):	$(TOP)/ext/session/changesetfuzz.c sqlite3.lo
- 	$(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
-@@ -1361,11 +1360,11 @@
- kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
- 	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
- 
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
--	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
-+rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
-+	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
- 
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
--	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
-+loadfts$(EXE):	$(TOP)/tool/loadfts.c libsqlite3.la
-+	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
- 
- # This target will fail if the SQLite amalgamation contains any exported
- # symbols that do not begin with "sqlite3_". It is run as part of the
---- /configure.ac
-+++ /configure.ac
-@@ -587,6 +587,9 @@
- if test "${enable_load_extension}" = "yes" ; then
-   OPT_FEATURE_FLAGS=""
-   AC_SEARCH_LIBS(dlopen, dl)
-+  if test "${ac_cv_search_dlopen}" = "no" ; then
-+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
-+  fi
- else
-   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
---- /ext/misc/sqlar.c
-+++ /ext/misc/sqlar.c
-@@ -14,6 +14,8 @@
- ** for working with sqlar archives and used by the shell tool's built-in
- ** sqlar support.
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <zlib.h>
-@@ -119,3 +121,5 @@
-   }
-   return rc;
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/misc/zipfile.c
-+++ /ext/misc/zipfile.c
-@@ -24,6 +24,8 @@
- **    *  No support for zip64 extensions
- **    *  Only the "inflate/deflate" (zlib) compression method is supported
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <stdio.h>
-@@ -2176,3 +2178,5 @@
-   (void)pzErrMsg;  /* Unused parameter */
-   return zipfileRegister(db);
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/repair/sqlite3_checker.c.in
-+++ /ext/repair/sqlite3_checker.c.in
-@@ -2,6 +2,7 @@
- ** Read an SQLite database file and analyze its space utilization.  Generate
- ** text on standard output.
- */
-+#define SQLITE_CORE 1
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc
- #define SQLITE_ENABLE_DBPAGE_VTAB 1
- #define SQLITE_ENABLE_JSON1 1
-@@ -14,7 +15,7 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
- INCLUDE $ROOT/ext/misc/btreeinfo.c
- INCLUDE $ROOT/ext/repair/checkindex.c
---- /src/shell.c.in
-+++ /src/shell.c.in
-@@ -61,6 +61,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include "sqlite3.h"
-+#include "ext/expert/sqlite3expert.h"
- typedef sqlite3_int64 i64;
- typedef sqlite3_uint64 u64;
- typedef unsigned char u8;
-@@ -127,6 +128,10 @@
- # define SHELL_USE_LOCAL_GETLINE 1
- #endif
- 
-+#ifdef SQLITE_HAVE_ZLIB
-+#include <zlib.h>
-+#endif
-+
- 
- #if defined(_WIN32) || defined(WIN32)
- # include <io.h>
-@@ -939,18 +944,7 @@
- INCLUDE ../ext/misc/shathree.c
- INCLUDE ../ext/misc/fileio.c
- INCLUDE ../ext/misc/completion.c
--INCLUDE ../ext/misc/appendvfs.c
- INCLUDE ../ext/misc/memtrace.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE ../ext/misc/zipfile.c
--INCLUDE ../ext/misc/sqlar.c
--#endif
--INCLUDE ../ext/expert/sqlite3expert.h
--INCLUDE ../ext/expert/sqlite3expert.c
--
--#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
--INCLUDE ../ext/misc/dbdata.c
--#endif
- 
- #if defined(SQLITE_ENABLE_SESSION)
- /*
-@@ -4135,10 +4129,13 @@
-     sqlite3_shathree_init(p->db, 0, 0);
-     sqlite3_completion_init(p->db, 0, 0);
- #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
-+    extern int sqlite3_dbdata_init(sqlite3 *, char **, const sqlite3_api_routines *);
-     sqlite3_dbdata_init(p->db, 0, 0);
- #endif
- #ifdef SQLITE_HAVE_ZLIB
-+    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
-     sqlite3_zipfile_init(p->db, 0, 0);
-+    extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-     sqlite3_sqlar_init(p->db, 0, 0);
- #endif
-     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
-@@ -6135,6 +6132,7 @@
-         goto end_ar_command;
-       }
-       sqlite3_fileio_init(cmd.db, 0, 0);
-+      extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-       sqlite3_sqlar_init(cmd.db, 0, 0);
-       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
-                               shellPutsFunc, 0, 0);
-@@ -10187,6 +10185,7 @@
- #endif
-   }
-   data.out = stdout;
-+  extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_appendvfs_init(0,0,0);
- 
-   /* Go ahead and open the database file if it already exists.  If the
---- /test/sessionfuzz.c
-+++ /test/sessionfuzz.c
-@@ -700,42 +700,6 @@
- #include <assert.h>
- #include "zlib.h"
- 
--/*
--** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
--**
--** Parameter SZ is interpreted as an integer. If it is less than or
--** equal to zero, then this function returns a copy of X. Or, if
--** SZ is equal to the size of X when interpreted as a blob, also
--** return a copy of X. Otherwise, decompress blob X using zlib
--** utility function uncompress() and return the results (another
--** blob).
--*/
--static void sqlarUncompressFunc(
--  sqlite3_context *context,
--  int argc,
--  sqlite3_value **argv
--){
--  uLong nData;
--  uLongf sz;
--
--  assert( argc==2 );
--  sz = sqlite3_value_int(argv[1]);
--
--  if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){
--    sqlite3_result_value(context, argv[0]);
--  }else{
--    const Bytef *pData= sqlite3_value_blob(argv[0]);
--    Bytef *pOut = sqlite3_malloc(sz);
--    if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){
--      sqlite3_result_error(context, "error in uncompress()", -1);
--    }else{
--      sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT);
--    }
--    sqlite3_free(pOut);
--  }
--}
--
--
- /* Run a chunk of SQL.  If any errors happen, print an error message
- ** and exit.
- */
---- /tool/mksqlite3c.tcl
-+++ /tool/mksqlite3c.tcl
-@@ -117,6 +117,7 @@
-    rtree.h
-    sqlite3session.h
-    sqlite3.h
-+   sqlite3expert.h
-    sqlite3ext.h
-    sqlite3rbu.h
-    sqliteicu.h
-@@ -403,6 +404,11 @@
-    sqlite3session.c
-    fts5.c
-    stmt.c
-+   appendvfs.c
-+   dbdata.c
-+   sqlar.c
-+   sqlite3expert.c
-+   zipfile.c
- } {
-   copy_file tsrc/$file
- }
---- /tool/sqlite3_analyzer.c.in
-+++ /tool/sqlite3_analyzer.c.in
-@@ -14,9 +14,6 @@
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
- #define SQLITE_OMIT_LOAD_EXTENSION 1
--#ifndef USE_EXTERNAL_SQLITE
--INCLUDE sqlite3.c
--#endif
- INCLUDE $ROOT/src/tclsqlite.c
- 
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
---- /tool/sqltclsh.c.in
-+++ /tool/sqltclsh.c.in
-@@ -27,19 +27,17 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
--INCLUDE $ROOT/ext/misc/appendvfs.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE $ROOT/ext/misc/zipfile.c
--INCLUDE $ROOT/ext/misc/sqlar.c
--#endif
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
- 
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
-   (void)interp;
-+  extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
-   sqlite3_appendvfs_init(0,0,0);
- #ifdef SQLITE_HAVE_ZLIB
-+  extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
-+  extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
-   sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
- #endif
- 
diff --git a/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch
deleted file mode 100644
index 3f3779d644e6..000000000000
--- a/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-https://sqlite.org/src/info/408144a1832569ce
-
---- /test/vtab1.test
-+++ /test/vtab1.test
-@@ -1303,25 +1303,27 @@
-   CREATE VIRTUAL TABLE e6 USING echo(t6);
- }
- 
--foreach {tn sql res filter} {
--  1.1 "SELECT a FROM e6 WHERE b>'8James'" {4 2 6 1 5}
--    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b > ?} 8James}
--
--  1.2 "SELECT a FROM e6 WHERE b>='8' AND b<'9'" {3 4}
--    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ?} 8 9}
--
--  1.3 "SELECT a FROM e6 WHERE b LIKE '8J%'" {3 4}
--    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8J%}
--
--  1.4 "SELECT a FROM e6 WHERE b LIKE '8j%'" {3 4}
--    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8j%}
--
--  1.5 "SELECT a FROM e6 WHERE b LIKE '8%'" {3 4}
--    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8%}
--} {
--  set echo_module {}
--  do_execsql_test 18.$tn.1 $sql $res
--  do_test         18.$tn.2 { lrange $::echo_module 2 end } $filter
-+ifcapable !icu {
-+  foreach {tn sql res filter} {
-+    1.1 "SELECT a FROM e6 WHERE b>'8James'" {4 2 6 1 5}
-+      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b > ?} 8James}
-+  
-+    1.2 "SELECT a FROM e6 WHERE b>='8' AND b<'9'" {3 4}
-+      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ?} 8 9}
-+  
-+    1.3 "SELECT a FROM e6 WHERE b LIKE '8J%'" {3 4}
-+      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8J%}
-+  
-+    1.4 "SELECT a FROM e6 WHERE b LIKE '8j%'" {3 4}
-+      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8j%}
-+  
-+    1.5 "SELECT a FROM e6 WHERE b LIKE '8%'" {3 4}
-+      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8%}
-+  } {
-+    set echo_module {}
-+    do_execsql_test 18.$tn.1 $sql $res
-+    do_test         18.$tn.2 { lrange $::echo_module 2 end } $filter
-+  }
- }
- 
- do_execsql_test 18.2.0 {  PRAGMA case_sensitive_like = ON }
---- /test/vtabH.test
-+++ /test/vtabH.test
-@@ -30,36 +30,38 @@
-   CREATE VIRTUAL TABLE e6 USING echo(t6);
- }
- 
--foreach {tn sql expect} {
--  1 "SELECT * FROM e6 WHERE b LIKE '8abc'" {
--    xBestIndex 
--       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
--    xFilter
--       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
--       8ABC 8abd 8abc
-+ifcapable !icu {
-+  foreach {tn sql expect} {
-+    1 "SELECT * FROM e6 WHERE b LIKE '8abc'" {
-+      xBestIndex 
-+         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
-+      xFilter
-+         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
-+         8ABC 8abd 8abc
-+    }
-+  
-+    2 "SELECT * FROM e6 WHERE b GLOB '8abc'" {
-+       xBestIndex
-+         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
-+       xFilter
-+         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
-+         8abc 8abd 8abc
-+    }
-+    3 "SELECT * FROM e6 WHERE b LIKE '8e/'" {
-+      xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b like ?}
-+      xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8e/
-+    }
-+    4 "SELECT * FROM e6 WHERE b GLOB '8e/'" {
-+      xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b glob ?}
-+      xFilter {SELECT rowid, a, b FROM 't6' WHERE b glob ?} 8e/
-+    }
-+  } {
-+    do_test 1.$tn {
-+      set echo_module {}
-+      execsql $sql
-+      set ::echo_module
-+    } [list {*}$expect]
-   }
--
--  2 "SELECT * FROM e6 WHERE b GLOB '8abc'" {
--     xBestIndex
--       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
--     xFilter
--       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
--       8abc 8abd 8abc
--  }
--  3 "SELECT * FROM e6 WHERE b LIKE '8e/'" {
--    xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b like ?}
--    xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8e/
--  }
--  4 "SELECT * FROM e6 WHERE b GLOB '8e/'" {
--    xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b glob ?}
--    xFilter {SELECT rowid, a, b FROM 't6' WHERE b glob ?} 8e/
--  }
--} {
--  do_test 1.$tn {
--    set echo_module {}
--    execsql $sql
--    set ::echo_module
--  } [list {*}$expect]
- }
- 
- 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3e3bff80f283..e88afc0079cd 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index ef143a7d4002..ceae9db576f6 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,13 +5,28 @@ DIST icedtea-bin-core-3.15.0-arm64.tar.xz 61788580 BLAKE2B f2c8d1d0ac823838881f0
 DIST icedtea-bin-core-3.15.0-ppc64.tar.xz 55179660 BLAKE2B 3404f1b4ddc6f1109d141e8a88ff1a913153660b318b84fee43ffe013164c578f9fcad6b75f8212cb11cc9ee89a8260d55b39c7f9516aa910d3838b0490fe923 SHA512 7d5e3c16e156f09610e915d3c9062b0f24f5d15045545009f48ba616e8f45184161018ed4136145ab9d15bab6d853052df7fabda43b9bcbcf99aabea8e52477d
 DIST icedtea-bin-core-3.15.0-ppc64le.tar.xz 55188860 BLAKE2B 732973320837e689b42942da80015109868d5772097111d5789a3bbee100a0b8d75cb581e1825a0c62bd582e93fe828b5575ac307efb73083d248c154cc28cd0 SHA512 887af69cc6c0a4227922da2500f228b108d9ac445e62c1836411d09a88df8579e0397d89b3f62b94f73e794a0014c67f4b1c8d2247ac1118967a63092e704078
 DIST icedtea-bin-core-3.15.0-x86.tar.xz 61650896 BLAKE2B ed5140790ac2946c4162ead15cd1d8aae812d41d4be3e4fff6669eedb438576e293385ec53405a2c67674c9fad9279497b2f334ef58040f6744b62059dc4882c SHA512 2efbacbcd77474d4a8506f9c4f7d66c3ad57f929644e4c541bb76139b6f1c6a776639a9708257a4ce5085660ddf2d50f54ef179a63746a9eeeba83384f810cc5
+DIST icedtea-bin-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b
+DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549
+DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2
+DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d
+DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da
+DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077
 DIST icedtea-bin-doc-3.15.0.tar.xz 11666068 BLAKE2B a4df6db09dfe47220cbfa07e12adaa03df490e81fcf38df490710502e78cfae741bf9d8f88ee81e8cf65465fa912b3139b239e858e5479e8af79a48c08444d5c SHA512 b990ceabf846b5be889ab706c3f259c23c335bf56aaa0e660206bedec4caef3d00fdd712d2eba5326e0b716010299b5b13e1089d91fd747cdf8cf58e4acce13b
+DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6
 DIST icedtea-bin-examples-3.15.0-amd64.tar.xz 1854220 BLAKE2B 3572d1571da58c493402421db4163879aece2f3b2717f2769ef94cf9612b429a0156f278ef2ee5e114de8b171cdac787f46b7cdd0d533cf2a5568c987c836ee4 SHA512 8dd6017f4a9c90b56e5559277155afce2c37995cca3bb2a96bf62e0310a3eb9e259023faac51b5d4e5688dceaa33efad9372a5f7667b314685578c97fc937e43
 DIST icedtea-bin-examples-3.15.0-arm.tar.xz 1839548 BLAKE2B 1903f85534b49ef71a548ccf29065d301871e024402540038a81561d02ac988a9060b7c33307366dee55838c8f9a2cf277e86e152701f8e5312241e5cf499850 SHA512 de9eaf56ce6b10ea2d3d676b1896884a5a98f1def01175e3456487ebb10f0da618a5d238a7fc9fe25607e5fbf53dc6fa7c65d71d6858731c3540e270357a13c9
 DIST icedtea-bin-examples-3.15.0-arm64.tar.xz 1850912 BLAKE2B bf047a0d606bcb766e84ef90fcb169446e9bb97ada118c51762d58ed2f4fe5a9139549676fc731b2230a75c65e3a4f23b06b0f2a3224d85567f5601a1320e66c SHA512 2d5527d7daabb3cf5bcfb262bdd072af2e051cca3171aa3a973ac81b53f74b898d8c5045a0bcea28db18edca602d8ca9912cd90a157ef6026e535a0087b576a2
 DIST icedtea-bin-examples-3.15.0-ppc64.tar.xz 1865608 BLAKE2B 34afb142c6db332d399868783d2972f3d4a2a7de90120e88f70edae3d2b0ae8299dc1587c1431d810ff8d69f26f884a51d676d2b7738ee04089780f6a5719f8b SHA512 d23adb53d6df49b607ea4267570ffe8f16801d6bd9a570b1311b881cf02329804da17464ca284cd6f4b316856a3cb504ebb347e9e76fa37c8cf8c41dbc20366d
 DIST icedtea-bin-examples-3.15.0-ppc64le.tar.xz 1862752 BLAKE2B 03cf9411aef4c3797c5a542072ef7ea53f3565d7c90b2e9e2dfc9caac8ffe41cc4588b848e5c6cfc5c275245a625dbee66fa170aa38aeae3ee2110f1d4d08888 SHA512 0bacf0f9d2b7b396e5afe1962d54cd559bf777dc896dc9bf6d7581380bce1aaeff4156e4c2082ee1955f2d503a5c6b8537bf32da1d4846b264026229c22ef01a
 DIST icedtea-bin-examples-3.15.0-x86.tar.xz 1860232 BLAKE2B e0b9fa6d5c452ea8d258cc035e7d9913f9423ec972d3729b266cf03b686f3012ae16101a0d97db660ffabacd05e92e3ce47624346a7ea5fc5b42a2d89d69fb0c SHA512 2a7b7a1e45fc84d115ba09bb2617c298a8c0d8084e61ea274c16df0f36bc1e240d0a74a37ff9f0cf0dd6dfe4be8f6208f7c6c132bc5637be95b2d9e19c1fe5d7
+DIST icedtea-bin-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b
+DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151
+DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662
+DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679
+DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e
+DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637
 DIST icedtea-bin-src-3.15.0.tar.xz 45859888 BLAKE2B 39926cb75a2eb784bb29322724ff452bd6fd259e5dfd583436a980073bf4b82277676d10ce29e155a1122a424718be6277e307d781d825d93b3909f1e6f1da91 SHA512 9523180f27da1936593a41322013a3147e4bd8bfded0589e39775dcd856736b97160a356c717969eb0a26d27c05cfb1dce6f08f6c09193a722e581f22f7a1dc4
+DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548
 EBUILD icedtea-bin-3.15.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
+EBUILD icedtea-bin-3.16.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
new file mode 100644
index 000000000000..930f0f3ad547
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="
+	doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)
+"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
+IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
+
+REQUIRED_USE="
+	gtk? ( !headless-awt )
+	nsplugin? ( !headless-awt )
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+DEPEND="app-arch/xz-utils"
+
+RDEPEND="
+	>=dev-libs/glib-2.60.7:2
+	>=media-libs/fontconfig-2.13:1.0
+	>=media-libs/freetype-2.9.1:2
+	>=media-libs/lcms-2.9:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/zlib-1.2.11-r2
+	virtual/jpeg-compat:62
+	alsa? ( >=media-libs/alsa-lib-1.2 )
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.32.0
+		>=x11-libs/cairo-1.16.0
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.42
+	)
+	selinux? ( sec-policy/selinux-java )
+	virtual/ttf-fonts
+	!headless-awt? (
+		media-libs/giflib:0/7
+		=media-libs/libpng-1.6*
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXcomposite-0.4
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.10
+		>=x11-libs/libXtst-1.2
+	)
+"
+
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )
+"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r ${P}/doc/html
+
+	# doins doesn't preserve executable bits.
+	cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+	if use examples; then
+		cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp ${P}/src.zip "${ddest}" || die
+	fi
+
+	# use system-wide cacert store
+	rm "${ddest}"/jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index deb930acb41f..677e351579f6 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,7 +8,6 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
-DIST apache-tomcat-8.5.53-src.tar.gz 5676477 BLAKE2B 284ddc3b3d491a57aac31fc59a9c7d80bdb11efb410ab53eea5d3a0a754507203de287eff0a621d02bfea581b45b860598c8ab95d529ad18790fe381f5518cca SHA512 d78613042a9e4caa5b5eeebd2589383ef10312698e535e2c8f82e40c7b3d793ea6cac50f346316a84f4b47ad330f82c7a4f0e4a3d2f0d449f1d4dad9c6d5e267
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
@@ -17,7 +16,6 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efc
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
-EBUILD tomcat-servlet-api-8.5.53.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
 EBUILD tomcat-servlet-api-8.5.54.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
 EBUILD tomcat-servlet-api-8.5.55.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
 EBUILD tomcat-servlet-api-9.0.34.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
deleted file mode 100644
index 085f83e7999e..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1d728839eaec..b9ca5e8a2e03 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c9acc9b708e3..e6f14499907b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,9 +5,15 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 DIST php-7.2.30.tar.xz 12283804 BLAKE2B f5d5c9bc56e3c3f32ebc0d830b826d98cd06992573c9cffa2c9bff35c161273079d0d08c1b289129cd8bd5d1f1da106bfee2d0e1c40c3d64b0e12b2452d3512a SHA512 92e79cdd0e8b925012235375ebece19038b42f3751e9623beda5807e3a07484d0faaabb58227c67abb515c188c09c215c9b00cc8dadffc90f0dd09f8f5dd126f
+DIST php-7.2.31.tar.xz 12309936 BLAKE2B fc81f41dd4ec8695029bfe1993d76b1fdfe7f16d926f57302b9e85f3acd250967db9b9f0597c47589ae553d5faaaf0266e24b5b64247e017361d991bf96cd4de SHA512 b21c504d0af2c095e4ae5a62c810af96171b927a27ea4694f59555c0d47798d61c3491a92941099cd9c978b3b0f41852ca2cf745e42ee3d9a6d107a5a884c9ee
 DIST php-7.3.17.tar.xz 12116072 BLAKE2B 5f8a0b1a3de9b7e750d249593be0a3eb9e62040691ebe4549da74d8c321dcd88e970d92285f49a924ef0f38118779d540a94810c08ece2df7dbd8584a8f83c56 SHA512 ac99a645a7442c322b8334cb4d091474bb0486b5efe11f8ffc16e4a2c0ecf8dbb5d958206372617350ec70b579dd4756f4d166c2863f3892db480e9bfbd14837
+DIST php-7.3.18.tar.xz 12116280 BLAKE2B 73d82e4a22f29dbeec221ef3109592a40e559238a0093e80e8e10bcd7de64f3bd58dd6f0835ddf3d9c2323fc37d738301b07291ca11a84c70ddced172676bc20 SHA512 e626091c835f6d165ff48ae3be8ddf7a66b0a320c6d77dc98fb73235d560814c180112a9e5478a5b3b6bb01ed99a50f8025fdc3d1ef80cca59e04ac248f9b0bf
 DIST php-7.4.5.tar.xz 10271296 BLAKE2B 396044265c810732fe7012375602faeb3477b8405d2264a17b29ac0783c0734c2fc1070b1532ea75a716a62c0dfcb01b861a22ebc6fb2e13efef20c40b62530d SHA512 c40070a91d5cab44df9b33d7259dcfb9824efb305a659d075b68695b3c5cebb915f43ce3edc45c9ee8b17a5c558e154842a1a63ac594438ce7adce48c58430fe
+DIST php-7.4.6.tar.xz 10284824 BLAKE2B 83bbbb536e48c6ab6ef357283d2f99a0f1825fdbb1867598514dc87cb8a7181298aa1e6d45659b7a4343fdacdacbbfec9e4cca89f85fe53c9e48696e534da710 SHA512 786634d53ed100cc7638e64ca340efdd42405c258638f3f97fcd1816d4f0c643dc8d8b2b0f60d36904343dc8c2af7f9b8e4a652ea66ec2fe324290c72bc09c13
 EBUILD php-7.2.30.ebuild 22602 BLAKE2B 8ab0172db7ae2ee926440ace9c4a4424dd3fa3bf87624ee7d7761a679b01d8b4eafed1b2b84ab5f649c8cce47d4686417257ad90135c05249e5d445c236f5ee9 SHA512 0bbcd9bb943212f56a205ad2a804455067bc98971b0094d998b37f0f4f35e53ab5f3641f6dd366a40e4bdeafdabfac953b98203e8cdd0989a9e0e075b3b1b99e
+EBUILD php-7.2.31.ebuild 22658 BLAKE2B 653c74e5c863494440cf0b793510ceebad362844aef357c128037e6add6a0823231b662ca9806c68a7babdc6d650e2445c732b9a2bd4fcab9bcffa58c6a52693 SHA512 fe151df3f61c5b65f4e62610cc7cfb82ca1875334cf4c4917a88f68f96b05a1d6b6096dd04ad86f7a787e4a11df974814a6d5d1f20a9f8fec6feaf70405f10a3
 EBUILD php-7.3.17.ebuild 22614 BLAKE2B 16359fe1ad955aab8f5cda62bbc7bf7f9abd4005052cfad897a0c94d525176c8f6a39b97e9454f254cf09e4ac4c24bbab6cb476089957d168e280c1429113e74 SHA512 f5e50aae8785d9fa4d22fa4538d1d00ab50dfff8df3a7a236e668bdb161f2061c7116b7605935fdc176dffbf05b6bc02796c50e203b5ab5af310d4ae5ebed34d
+EBUILD php-7.3.18.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55c31c829c7c40e01657916d376801096d8e273a4157435f0b489f776240114160d50c9399d4795ed9f7018d7 SHA512 a9f5c18c1b4667fa1730801877872434a5c146c34941da1a3b6348c7ec1bfbf152041e128faf8d962f77db17e2f94f704bfc67db71838d3f6ac3dfb0a846d4d5
 EBUILD php-7.4.5.ebuild 21325 BLAKE2B c08260ef1caa815db6ed08a139d335b8f71cbeca9aa01cb16b3d94ff5de29c6f3d3a351c35170ed885d5e590518d1810e88ec77016271d181a8b2e6cb9e56dda SHA512 ab032a908942ed61c5ea5a1e96338790364b2516e93ab999c703b3b49b023acd790214c41dcb3476712a19f0f1abf5f3170383bc5803ff670394af9caa620474
+EBUILD php-7.4.6.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
 MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc
diff --git a/dev-lang/php/php-7.2.31.ebuild b/dev-lang/php/php-7.2.31.ebuild
new file mode 100644
index 000000000000..1b2056f984d8
--- /dev/null
+++ b/dev-lang/php/php-7.2.31.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+	zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="",sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.18.ebuild b/dev-lang/php/php-7.3.18.ebuild
new file mode 100644
index 000000000000..705d68d153f3
--- /dev/null
+++ b/dev-lang/php/php-7.3.18.ebuild
@@ -0,0 +1,760 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.6.ebuild b/dev-lang/php/php-7.4.6.ebuild
new file mode 100644
index 000000000000..3ac0d8c9ace3
--- /dev/null
+++ b/dev-lang/php/php-7.4.6.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=dev-libs/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-external-pcre
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index b49c1f631421..00b001013d5e 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,6 +8,7 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
 DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 822e231cf2755e6477e49e9128a983185a4f1e30e9d6c221f1b5720891c0de345e8c5402af458d3627eba124e75fea4b5daa94e01b0eaddc116dc3281263ecbe SHA512 26147099e1f1a0ffc85febad26e18e991f019599a150887ea0b925e34663fad8e03b3c2a941e2770c1a63960695e173ef32709572c9361e7f2cb862ccf75b28a
 DIST Python-3.7.7.tar.xz 17268888 BLAKE2B 5f16c9559249470a9e6c0aa686965e7d78ce0f7364b5d03fc9590613c7a5456f92835340e49bf9becbec18b18d1e5a6fc318b6e30f2349da3246a918cf8b05ff SHA512 ddc838a7b0c442c2e465616f20231f2b703ed6b69ed2dc17858aac8760814fdf7cff43d350d359300e47b6bb1f0bd38c31126b855e423a3a65ed06a8fa16d136
 DIST Python-3.8.2.tar.xz 17869888 BLAKE2B f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4 SHA512 ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
+DIST Python-3.8.3.tar.xz 17912964 BLAKE2B 9c415823f70bad97936e0472fc53a1b7650cbf0082da714266095dec74e0cd4a48c9477ad03fbb75fdc2cd8e41ef3aa5839e38fc69751720f5cb5c7fc77cce17 SHA512 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4
 DIST Python-3.9.0a6.tar.xz 18202376 BLAKE2B 32f04613a3b11341759eb98fd4b16edcb890a9ce19a4d5031aecdccd985a5462248fcd0e7bf478e2f23490ad85b36c760c14398f2b238e26038a476831f004d2 SHA512 edb71840347ab2b5e18b3a2b831a3d9a26e1af52de9b1c6c088ce2d20f8e96a22c87fc3677b62e49c91a00d8b531028bdc739f00fe220dbdeb343daf17829be4
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.18.tar.xz 15012 BLAKE2B f691e231c793bb8f11fb64c89b90e022af8e0fe0e28839822c2ae6214fdab6c6fd9c07466c4b5797d3964b7db09fd979597774fb7872dc674e8df59321b6bf95 SHA512 a2952b27bfc0a52f322b2f3e177cbe09fa288c9ca5967c13fb9c2d45d3e81033407e30e86bdaaaa258f0b3cfa2cef6eda5502bddb6390f9512a493d145d34e03
@@ -17,6 +18,7 @@ DIST python-gentoo-patches-3.7.6.tar.xz 10084 BLAKE2B 220869e85bdaf9c21b1b05e138
 DIST python-gentoo-patches-3.7.7.tar.xz 14644 BLAKE2B 1a377eac945310082ec9fa257bcb406c7eaf24b5e80469dd49e82a1bc0554b75394678609cae447cb0fc7a19059b29166bf110b6ed99a89a9919b3a56a323f87 SHA512 2c7fbcefd6f4d1674b78f3b67f2be3f1b168e08c318fefe8d4757f2d30c22477f5010ad6f2c0abb265d819ee667617f21f93e002242e216b4ee570200b0ddf74
 DIST python-gentoo-patches-3.8.1-r2.tar.xz 10108 BLAKE2B 02d3e2ae95b5cfa67c0ba4ff618fbee51d2342955d0a064b80575beda73902bd72462e4f6dba63743bf9fc031d92c69153ef8bd8a0ab5d6e17bfdf8ed0152da5 SHA512 757f7cf6b0cb6c1493d8ed8e5780780efcb32860a9aeba4f933a3a3fb22c412bebde8854e34609465d8a12cb9545a7b19e5d5dbe87d772bb83acd9fe829b75cc
 DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
+DIST python-gentoo-patches-3.8.3.tar.xz 10704 BLAKE2B 6fdd13139b1132313153af2de774abeca7c1fe9acb34a87e5d96875a4cbe8c22c201acbb11c15eeaf828493c32f6acd89e3b5d4012fa2c9d216da556aadb9f01 SHA512 6f67d77e8240983c0dd749620e5df81df5816b831032e190c82c8d73ea8a995daf2631640234a1350e483bd13276466457d110176612bfde3281d1b6a8bf97bb
 DIST python-gentoo-patches-3.9.0_alpha6.tar.xz 8916 BLAKE2B ca611dd96e6fca625def6affeb35daa1c869ffa3b84bd13d5cc2dff7ffe4e0aaf4a76b3ed35d4520fe64f1905a644ecc2dcd80259f88264adeff926d728df76e SHA512 b3cd6619d998db8c828fc05eeba74d644ead60d34c279943725ea94ee9e5d45a07d481af62b8589336c55bb8baa23d6559aa57a73d11bf2364b6e9b839e0a4be
 EBUILD python-2.7.17-r2.ebuild 10766 BLAKE2B c74dbef430e0078769e09c3641a705771d150d23777cee7f84b38abe1422c2be16520f131b59b97b9377c57acad12fb9051900ed0baf63287f173e4057735324 SHA512 a9bfe80ce8cc52a5147fe69e52d0bb86e8828bd8bd99fda3549302020c6f4496a69f0e5b9d1fffb2882b84d0fc1b947e83751b315de3119a320b52dcf2d580f6
 EBUILD python-2.7.18.ebuild 10594 BLAKE2B e131ef36b19dc5b78f852efebd63c34f631dae453583c9941212fc6c84eaf9299e902873d44ad9e27d52f4b287ac552d82391af2fe945e63dbfd4cf7f472dc03 SHA512 ceff960b1a242efa9c14f71ee2634fef9fba29cdfe089464ea516179f3a2417a26a1e13a0aad0911cedeb9dfd929af5534598ba8e71eff1484d2a8b7118d84f6
@@ -26,5 +28,6 @@ EBUILD python-3.7.7-r1.ebuild 10078 BLAKE2B d696122aedb2f0200242d4c3510fc83daf7d
 EBUILD python-3.7.7-r2.ebuild 9877 BLAKE2B 182391402d72a38090801f4ea95ddcc26385bfb6174d7fffe6d0acb45fc735ca62d561ba64b324f2e6d64761f51ec18dfc1c4f04abe131138ebe8985b927fd2d SHA512 39fed5b175cf581371ae4150c539e4a2d1a3d5f7f247d92147c49fd8cd7eb231688d7507b1efb10194683834b37697c5f4e6721bffd592ca8698355fe9670a58
 EBUILD python-3.8.2-r1.ebuild 10206 BLAKE2B ea5c774f23813cea83a720bc0cf66e6f538954a8a734727695117cdeae656a6760483c10537e90369f7493dbe157f850e1bfb031b68b377f14a686587efb9660 SHA512 6731f18667e3554379ceb7b17bc3c9fd04cd1a83dbdb023286f93e0f89f0a92ccae6346e5bfebf174bd8c96ad02d9029bc6898d404e236c9d43219144a026f63
 EBUILD python-3.8.2-r2.ebuild 9929 BLAKE2B d01a4201f9507305e4837f2d0f6bdbbeef5f562b67dd7d66260af2ec7523f1721622e57dc176eafa947e33f56beac8bbb21d21b3094be7dbcd4d6a19f2d9609c SHA512 a61ae7e53f29a5db3dc88f43d9eb71588c65ea0a3901530a3e8714bf91aa4e6050f39252170ac2fd7869df1e9d9887027081b9cde5a9c4471d4d74670d16ce8d
+EBUILD python-3.8.3.ebuild 9934 BLAKE2B 9319fd3f2283fb848d28e153b25bb771f2f060fa5348a7b6ccbad0c3a706713bc9f05abb1acf928df4df8b00dd77562e814dd6c610bab33a19b738f57c38ee9b SHA512 9a3ff67e6b8105790fe72f9359aa6fedcfb06860d4b67ff3c5bc50c8d84ed5324dc2d581d39c6867bf103414c4db2a2657730a48ff58e85b7665ef5d0dd55a0e
 EBUILD python-3.9.0_alpha6.ebuild 9438 BLAKE2B 02ce0897bdc5a82ff90125906e1a5bd07e14ddc44d40e080679c74ea70a9141d0ea0ee07f69994390902688b8b314fcb394ff936ec438aac1cf44ecc9974900c SHA512 e43797ef0801eef5f000a3ce161e523ebb030679cb8cfd6f70c7d53a138eb9f58f4b8e259aa97ee57f4a7047d87ced27635daf82a8f1d28754ae98b98a08b381
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.8.3.ebuild b/dev-lang/python/python-3.8.3.ebuild
new file mode 100644
index 000000000000..c1cb51ab328b
--- /dev/null
+++ b/dev-lang/python/python-3.8.3.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-3.8.3"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
+	then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index c3b878dff7c9..27bce9e27e10 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,9 +1,9 @@
 DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037
-DIST swipl-8.1.27.tar.gz 10911864 BLAKE2B d65dfe1103fd82adfbb81251c45b085c70d7c494ca0f484dc2d14b74658418272d679107981ac04814f1151ef5c71ec1d68176ae792540936c2047572e521e21 SHA512 f5cc8ed07c28a3f6a67213f66647e0e8fef80fd31871852283ac99d4b137da560734c8f0cf6c12563b0576f8fce8def752caa2b9f84619ca8a8c11d42c5949b9
-DIST swipl-8.1.28.tar.gz 10905268 BLAKE2B 91d2838b74384a78f32649a84c64aa0d9c66495bd45c6729f15e7a8f894521996827da792eb5449f78ed3778722426a02aad54221f3bea5d505b1e639cefe300 SHA512 0ea387aaabcc028362ee42a87b72237b59f6ddc8fccadeef81f0480136a6b8492a7420a3209ef7501425fa16fd362915c7d828a6f1bd3ff84b537ecba802ade7
 DIST swipl-8.1.29.tar.gz 10902999 BLAKE2B 2163cbe4ce772fc0ba8dc961aabf5d3940e0b735bb4688050041d8bcbe6c052d5308696cbbcec49ecc100db44faa960fd8520d89a934f9b05994170c5fab5bff SHA512 0aeaa093a0cc39375b25f2ac642dec99c50aad82c5fa0069be6c5c7bf3ba53deb20e4c887e47649874305e91e7c963bab2515ab8a48db6cdfae6e4560aee063f
+DIST swipl-8.1.30.tar.gz 10921576 BLAKE2B ce163c7600554e5a2f62a75c4fc17444c115adda96527068f6ee707f390c9383e8e2f7a24cf493903edd895fd5ece186b7645cad50d44805d57617c7182ba120 SHA512 1b8be8d4f987bb4ce4e3ea82ab02c0e89f2fba68818a15bf2b86593ba53724005cf617f69e41a4394009dcd0abda84103cba4d4bb3ae562b29d942d0f55cad9a
+DIST swipl-8.1.31.tar.gz 10949562 BLAKE2B 60a4dd1da1cce309f45e557b25d7fa384ac0d75bf819b5e49d8303cae260d6576b01adb9c26bd7496962ae64a3b012c146408f8adaf6a253c526d50f5ed6b74c SHA512 629dd038fac868b0a2bcf71807ff6e795fd9c83a21358ef679b27bde8197b6f0aaf588a033720db9b1dd88c27dfeb0a42a13bc04e938f504524b48fa34891f1d
 EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96
-EBUILD swi-prolog-8.1.27.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
-EBUILD swi-prolog-8.1.28.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
 EBUILD swi-prolog-8.1.29.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.1.30.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.1.31.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
similarity index 100%
rename from dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
rename to dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
similarity index 100%
rename from dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
rename to dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index c8d5c15b02d3..0e1a07d9d5c1 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -4,5 +4,5 @@ DIST yasm-1.2.0.tar.gz 1436502 BLAKE2B 7be4f0cb5bd687868451fa6051ce9a621847c4ec8
 DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
 EBUILD yasm-1.2.0-r1.ebuild 1297 BLAKE2B 58304a9a89220672a1bbee4bf1dbc5e9a06d224aadfd57c6d8a6d76c4a8f446f1525c0e99fd028d1e89dcdf0e349a0105a59da6d41a50717a9c4c62adb55df79 SHA512 d2b6f99c3daae13679c27a5cac1d247b55d233edfb6b9e2105659f2f83ae688425c6b2454532c219b29fbe54bbdb5158d6c0b0f97967aaa58723d1317a7154da
 EBUILD yasm-1.3.0.ebuild 1040 BLAKE2B 9f3fac954020ac8c4c04e49f38bacda09e44566f41b906befb3a81aa1e02128554d114acda6d21e75b20b5a53341ed9e7e9f2ca1c436ba38401156681645c271 SHA512 a77af8925e65478ed791a98b36c3d673f2d4109bf25c10044b735d53f93d1458c7be345bd6aad99e26170b8b7998a1d5ca439490e9972ef72e934dc0d4c3c1b7
-EBUILD yasm-9999.ebuild 1645 BLAKE2B 72b9dcd4960fb779dbf206e7b75a7e0280a148e8e0acabdf130e0d4a41200cdab3335097cba2c024097467e0c0f705431fcb0e2741e6a39eb24e8f744a3e8b93 SHA512 67c02a85e172a296e386603f38496b2105ae5ac11de3edda0f2a17b4a227d58c7d9a51261cdcde7cab61a3a69c802258bc5e275248aea1c42eb612fae38659e0
+EBUILD yasm-9999.ebuild 1431 BLAKE2B f6e51b8efa53725c08236ed4482984f38d5f5ad1751615523ed1b99cfb76f9cb4069fd3c2cbd126b8b42068c55ddfe798494d8500b30854be6abaa4081a1af74 SHA512 4b9e291ffb930b356445ed44ac3e389e34f92597cc124138dce6f96444a8866325b280e9e6c15a36ab4df8197ab8e481186ef02ee28bd7d1be6180b5c730abaa
 MISC metadata.xml 261 BLAKE2B c5880d50c9def415b65cade7de2e9f4d5f46c98e4d60cde4c85b45cd0c2b1c65b695b85c6533fb018dc545fbc562284485818cf0b2db3109b088310dc7be53f7 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index 5be4c7a9719b..cf48d28e8623 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils python-single-r1
+inherit python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/yasm/yasm.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
@@ -50,16 +50,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	if ! [[ ${PV} == 9999* ]]; then
-		sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
-	fi
-
-	# ksh doesn't grok $(xxx), makes aclocal fail
-	sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
-
-	eautoreconf
-
 	if [[ ${PV} == 9999* ]]; then
+		eautoreconf
 		./modules/arch/x86/gen_x86_insn.py || die
 	fi
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 35fe08dbec2e..6ae5c0341602 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7e494187d757..bf3c6923fb0b 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -7,6 +7,7 @@ DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
 EBUILD botan-1.10.17-r2.ebuild 4260 BLAKE2B a638b40227d5f8e4f4776407718ab20921930d1e0aebf73322097ea5e106c77c570f4b59890a044f965930cfc3c04900e359027793ea70835e98e6df1d5a0cc3 SHA512 8735649c85d603ceba417a7d2b5d61a3067c4e8493965d54d02c10fbf48e431846dcb3138a313fe00eea1a12fec7d84d8a43e7a7160b6ba54e9e7da1c940c093
 EBUILD botan-2.11.0.ebuild 2458 BLAKE2B 9b222461452f52d637669263c552779697b12b8e843490e8257061148864cdc820f94dd1e3fba4445ecaad8318597a7b792a3d8f45b9525478646779dfd7457d SHA512 af7f1e9d8f65ef7b0fd6b09d1b239a43456382929e490600fb77eb28d5412ab5fac82e92c433017bf666d3e7ad3e4ba68f9a832191bae5d3d2c32e3977d941e1
+EBUILD botan-2.14.0-r1.ebuild 2617 BLAKE2B dac3663ccb7e7522016bea099fd525e675519424769604e704c13d015eff9862e921d9338781755e35872d4eb47c714ba41d8887d5d0d5c7bf6fb3a8b7ea96a7 SHA512 810be6c16afa705dd9536ccf2467b2224c76a7c4477fc8a5448447ffa0ac72881a358b8b35350773b9536e51e36fd63e97162525c13deed4f7a536c5ec668ec9
 EBUILD botan-2.14.0.ebuild 2459 BLAKE2B ec844c7d54d51204af44e4e55464a71b1c15670326a267d28a0c177314cf49eaab7ee43b7b64a4ef2af00d47f0809d3f1778f87c6a4d1a28a164fe9007320c2c SHA512 4e9df2af74bac749cf9a74a14286962e35a245912e248530221200fa5d07280ff45f71398863055373704eaabde6535dbcd8f61b343a8c522d7fa9856ece5054
 EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
 MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..1e33b401056b
--- /dev/null
+++ b/dev-libs/botan/botan-2.14.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+MY_P="Botan-${PV}"
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+BDEPEND="
+	dev-lang/python:*
+	doc? ( dev-python/sphinx )
+"
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) CHOSTARCH=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	# Don't install automatically, do it manually later in right place
+	# https://bugs.gentoo.org/723096
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
+		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
+		--no-install-python-module \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_domodule src/python/botan2.py
+}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 83fdfe741869..c7620b630ed0 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,3 +1,3 @@
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
-EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
+EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
index edde80805904..97f2ad1beba3 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ MY_PN="pcsc-${PN}"
 MY_PV="${PV/_p/final.SP}"
 MY_P="${MY_PN}_${MY_PV}"
 
-inherit autotools linux-info toolchain-funcs udev
+inherit autotools flag-o-matic linux-info toolchain-funcs udev
 
 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
@@ -32,6 +32,12 @@ S="${WORKDIR}/${MY_P/_/-}"
 
 CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
 
+pkg_setup() {
+	# Add workaround for GCC-10,
+	# by defining narrowing as warning like GCC-9 did.
+	append-cxxflags -Wno-narrowing
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index dd25e7b78f3f..dd862300b32a 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,9 +1,11 @@
-AUX json-c-0.14_cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
+AUX json-c-0.14-cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
+AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764c3786b8a35ad6b4e5736561901fd7c24f46f0f48b7dfb1b21395fa0fbda24e2bbbfd81d50f9c8de52908022c766df744 SHA512 3a3c31890ef7c1d6cca4f2bcd1b76602165471ab03d55c85da8c821e82e1985fa33ebbc35fa63350158fba5ba517f45f0a895f0624da97bb6f7caab0e4eec7b6
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
 EBUILD json-c-0.12.ebuild 916 BLAKE2B 835228c2ad857ff7a698d12400958b8aaa7da2828d92617b36db62e01433a3efbd3704134089b63f3a440489ae03bfcf873c303b35ccca516099d47f7633fb0c SHA512 02b0f07045736394ef18ca98901496c73153043e8825da2039c89607d5d2ca399e70ae371297f0b88ec05caad06a95ba83e589ebc89eea5345ecb12a05b4b3de
 EBUILD json-c-0.13.1-r1.ebuild 979 BLAKE2B 7df2aca92e501c35826dc6c30e190cbafc2719203bba58bcf525b8d6bb15e3602d4b69c5544032c34e90fd6e9a285cedeab5094e383aa2b0d434660ee8b72b35 SHA512 b7ed1dd4ac4ba08082c244bfe414abc1462491ab03d3ee1756641936323f8c19d6ee45a4681e48f3facd6584c8678e5c200d920950a4533b0b8c345273885056
-EBUILD json-c-0.14-r1.ebuild 1085 BLAKE2B 292a5c208ceacf84dfe9741954c23cc3ebef6211ae9bf2cd822cb0799432905aaacec37b3925d018eb1c60ee53d571407ccb5e84cb78534d096e235c981e0b5e SHA512 2130bf196a82c1dce499e9a84bdae5ef09a5aed7eb481a92a040b74a0f0b570cd7331c9269dcf51f91aa465833c6b37bd5396c83c5cbc8eeb78121ead68745d5
+EBUILD json-c-0.14-r1.ebuild 1091 BLAKE2B 219385bac46329baf50c5035ba9f662f6c5a294d53db0822e28e9f287092288b6f772dfa698839f30ab72518b4c96543099ad1534578fc894537e3ec6eff995a SHA512 3ba9f6268a6cbbe47c9f562f6f20d2bf8c7e340b9d902abec019770ab7b53236e5cbbdc77e2d0110ed4fe8a0141868fdbe4c430fad2b655b867510ab611a7ef6
+EBUILD json-c-0.14-r2.ebuild 1123 BLAKE2B add3f93e476757451434f8bb1e4637d5e1ccbd7e02903dd763fbe0a2452a860f4b7a04f464a7b7e264148aed8bedfd66f6a1502a5fe954a888a8a5ca62809a01 SHA512 dbf5fbfba39654a61f9647a07f582beb101e213957567ab54301a8e899329f6b17d7ce8dc6b7650543a60e6d86bda9b6e4e63e5b4f7a11f2bc6506bd2640d73d
 EBUILD json-c-9999.ebuild 896 BLAKE2B 50472b5af6d32d7f34260d23cd3104b169950f4d2558e709e4ac1891a5fd3318e3642c24aac053237dddf3164407d028270c7380c211ae7df24679bbc2bccf66 SHA512 e415df947a96271e63acd845b5a61032f7258b9cbfe60771f849c928f0223728f2053b73045163fd5a9601551956567b0f802f893e1077c4a87cfc60020fdd18
 MISC metadata.xml 1000 BLAKE2B 3b29ad6f95a8a66a09a2db159cc3bb6881cca30bf12a6659999c68500b739a5562e67d56380aca518da55f32e4edc117f59200adcb73b51257d34e6e952a460e SHA512 fc23e7b7ab9b16a04e5a1bc85571edb5629d37eb599d76db34ab9d988e54dd4d2ddc98f8e2567a97bc18871c0375cf3353053a67ae7eea47657928f40b363f6f
diff --git a/dev-libs/json-c/files/json-c-0.14_cmake-static-libs.patch b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
similarity index 100%
rename from dev-libs/json-c/files/json-c-0.14_cmake-static-libs.patch
rename to dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
diff --git a/dev-libs/json-c/files/json-c-0.14-security-fix.patch b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
new file mode 100644
index 000000000000..69a0bc754716
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
@@ -0,0 +1,155 @@
+From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:41:16 +0200
+Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
+
+If the assignment of stop overflows due to idx and count being
+larger than SIZE_T_MAX in sum, out of boundary access could happen.
+
+It takes invalid usage of this function for this to happen, but
+I decided to add this check so array_list_del_idx is as safe against
+bad usage as the other arraylist functions.
+---
+ arraylist.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arraylist.c b/arraylist.c
+index 12ad8af6d3..e5524aca75 100644
+--- a/arraylist.c
++++ b/arraylist.c
+@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
+ {
+ 	size_t i, stop;
+ 
++	/* Avoid overflow in calculation with large indices. */
++	if (idx > SIZE_T_MAX - count)
++		return -1;
+ 	stop = idx + count;
+ 	if (idx >= arr->length || stop > arr->length)
+ 		return -1;
+
+From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:46:45 +0200
+Subject: [PATCH 2/3] Prevent division by zero in linkhash.
+
+If a linkhash with a size of zero is created, then modulo operations
+are prone to division by zero operations.
+
+Purely protective measure against bad usage.
+---
+ linkhash.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/linkhash.c b/linkhash.c
+index 7ea58c0abf..f05cc38030 100644
+--- a/linkhash.c
++++ b/linkhash.c
+@@ -12,6 +12,7 @@
+ 
+ #include "config.h"
+ 
++#include <assert.h>
+ #include <limits.h>
+ #include <stdarg.h>
+ #include <stddef.h>
+@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
+ 	int i;
+ 	struct lh_table *t;
+ 
++	/* Allocate space for elements to avoid divisions by zero. */
++	assert(size > 0);
+ 	t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
+ 	if (!t)
+ 		return NULL;
+
+From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:47:25 +0200
+Subject: [PATCH 3/3] Fix integer overflows.
+
+The data structures linkhash and printbuf are limited to 2 GB in size
+due to a signed integer being used to track their current size.
+
+If too much data is added, then size variable can overflow, which is
+an undefined behaviour in C programming language.
+
+Assuming that a signed int overflow just leads to a negative value,
+like it happens on many sytems (Linux i686/amd64 with gcc), then
+printbuf is vulnerable to an out of boundary write on 64 bit systems.
+---
+ linkhash.c |  7 +++++--
+ printbuf.c | 19 ++++++++++++++++---
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/linkhash.c b/linkhash.c
+index f05cc38030..51e90b13a2 100644
+--- a/linkhash.c
++++ b/linkhash.c
+@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
+ {
+ 	unsigned long n;
+ 
+-	if (t->count >= t->size * LH_LOAD_FACTOR)
+-		if (lh_table_resize(t, t->size * 2) != 0)
++	if (t->count >= t->size * LH_LOAD_FACTOR) {
++		/* Avoid signed integer overflow with large tables. */
++		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
++		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
+ 			return -1;
++	}
+ 
+ 	n = h % t->size;
+ 
+diff --git a/printbuf.c b/printbuf.c
+index 976c12dde5..00822fac4f 100644
+--- a/printbuf.c
++++ b/printbuf.c
+@@ -15,6 +15,7 @@
+ 
+ #include "config.h"
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 
+ 	if (p->size >= min_size)
+ 		return 0;
+-
+-	new_size = p->size * 2;
+-	if (new_size < min_size + 8)
++	/* Prevent signed integer overflows with large buffers. */
++	if (min_size > INT_MAX - 8)
++		return -1;
++	if (p->size > INT_MAX / 2)
+ 		new_size = min_size + 8;
++	else {
++		new_size = p->size * 2;
++		if (new_size < min_size + 8)
++			new_size = min_size + 8;
++	}
+ #ifdef PRINTBUF_DEBUG
+ 	MC_DEBUG("printbuf_memappend: realloc "
+ 	         "bpos=%d min_size=%d old_size=%d new_size=%d\n",
+@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 
+ int printbuf_memappend(struct printbuf *p, const char *buf, int size)
+ {
++	/* Prevent signed integer overflows with large buffers. */
++	if (size > INT_MAX - p->bpos - 1)
++		return -1;
+ 	if (p->size <= p->bpos + size + 1)
+ 	{
+ 		if (printbuf_extend(p, p->bpos + size + 1) < 0)
+@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
+ 
+ 	if (offset == -1)
+ 		offset = pb->bpos;
++	/* Prevent signed integer overflows with large buffers. */
++	if (len > INT_MAX - offset)
++		return -1;
+ 	size_needed = offset + len;
+ 	if (pb->size < size_needed)
+ 	{
diff --git a/dev-libs/json-c/json-c-0.14-r1.ebuild b/dev-libs/json-c/json-c-0.14-r1.ebuild
index 90731d8f93d0..ffcb7c372fdb 100644
--- a/dev-libs/json-c/json-c-0.14-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.14-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 IUSE="doc static-libs threads"
 
 PATCHES=(
-	"${FILESDIR}/${P}_cmake-static-libs.patch"
+	"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/dev-libs/json-c/json-c-0.14-r2.ebuild b/dev-libs/json-c/json-c-0.14-r2.ebuild
new file mode 100644
index 000000000000..112d83d1854a
--- /dev/null
+++ b/dev-libs/json-c/json-c-0.14-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A JSON implementation in C"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc static-libs threads"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
+	"${FILESDIR}/${P}-security-fix.patch"
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/json-c/config.h
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DDISABLE_WERROR=ON
+		-DENABLE_THREADING=$(usex threads)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && cmake_src_test
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+	einstalldocs
+}
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index af41ac5fac5c..7417215e83a3 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,4 +1,3 @@
-AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
 EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
 EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
diff --git a/dev-libs/libg15/files/g15tools.patch b/dev-libs/libg15/files/g15tools.patch
deleted file mode 100644
index 7eb6e915e596..000000000000
--- a/dev-libs/libg15/files/g15tools.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch from upstream bug tracker:
-https://sourceforge.net/tracker/?func=detail&aid=3336448&group_id=167869&atid=844658
-
-As only part of G510 support was merged to upstream. Does NOT apply & compile
-on top of 1.2.7-r1.
-
-diff -aNru trunk/libg15/libg15.c mod/libg15/libg15.c
---- trunk/libg15/libg15.c	2011-03-31 23:33:44.000000000 +0000
-+++ mod/libg15/libg15.c	2011-06-26 07:08:21.000000000 +0000
-@@ -1029,6 +1029,76 @@
- 	}
- }
- 
-+// Logitech G510 Media Keys implementation. Unknown if this will work for other
-+// models. Using the backlight key as a modifier. The assumption is you would
-+// normally not be holding down the backlight key while pressing G-keys.
-+static void processKeyEvent2Byte(unsigned int *pressed_keys, unsigned char *buffer)
-+{
-+    // Key modifier
-+    *pressed_keys |= G15_KEY_LIGHT;
-+
-+    // XF86AudioPlay
-+    if (*pressed_keys & G15_KEY_G1)
-+	     *pressed_keys -= G15_KEY_G1;
-+
-+    // XF86AudioStop
-+    if (*pressed_keys & G15_KEY_G2)
-+	     *pressed_keys -= G15_KEY_G2;
-+
-+    // XF86AudioPrev
-+    if (*pressed_keys & G15_KEY_G3)
-+	     *pressed_keys -= G15_KEY_G3;
-+
-+    // XF86AudioNext
-+    if (*pressed_keys & G15_KEY_G4)
-+	     *pressed_keys -= G15_KEY_G4;
-+
-+    // XF86AudioMute
-+    if (*pressed_keys & G15_KEY_G5)
-+	     *pressed_keys -= G15_KEY_G5;
-+
-+    // XF86AudioRaiseVolume
-+    if (*pressed_keys & G15_KEY_G6)
-+	     *pressed_keys -= G15_KEY_G6;
-+
-+    // XF86AudioLowerVolume
-+    if (*pressed_keys & G15_KEY_G7)
-+	     *pressed_keys -= G15_KEY_G7;
-+
-+    g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x\n", buffer[0], buffer[1]);
-+
-+    if (buffer[0] == 0x02)
-+    {
-+        // XF86AudioPlay
-+        if (buffer[1] & 0x08)
-+            *pressed_keys |= G15_KEY_G1;
-+
-+        // XF86AudioStop
-+        if (buffer[1] & 0x04)
-+            *pressed_keys |= G15_KEY_G2;
-+
-+        // XF86AudioPrev
-+        if (buffer[1] & 0x02)
-+            *pressed_keys |= G15_KEY_G3;
-+
-+        // XF86AudioNext
-+        if (buffer[1] & 0x01)
-+            *pressed_keys |= G15_KEY_G4;
-+
-+        // XF86AudioMute
-+        if (buffer[1] & 0x16)
-+            *pressed_keys |= G15_KEY_G5;
-+
-+        // XF86AudioRaiseVolume
-+        if (buffer[1] & 0x32)
-+            *pressed_keys |= G15_KEY_G6;
-+
-+        // XF86AudioLowerVolume
-+        if (buffer[1] & 0x64)
-+            *pressed_keys |= G15_KEY_G7;
-+    }
-+}
-+
- int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
- {
-     unsigned char buffer[G15_KEY_READ_LENGTH];
-@@ -1063,6 +1133,13 @@
-       case 9:
-           processKeyEvent9Byte(pressed_keys, buffer);
-           return G15_NO_ERROR;
-+      case 2:
-+          if (g15DeviceCapabilities() & G15_DEVICE_G510)
-+			 {
-+              processKeyEvent2Byte(pressed_keys, buffer);
-+              return G15_NO_ERROR;
-+		    }
-+			 // Deliberate fallthrough
-       default:
-           return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
-     }
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 09337e69b160..0b69d355ba5b 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -2,5 +2,5 @@ DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libparserutils-0.2.3.ebuild 594 BLAKE2B de28d631a4441252c99427514903d940386ef97b58dd2c2ab887a99d523c97f18485274e4399d3b0924b4318397fe165699599e2479463403a0479cdcbf1b011 SHA512 da4fe6b526150b45a9bf6d16f412309122564fb1470bf92e5d4f54b425e98ba8ad33aeee0b5ed2f93c9c7383dc4cb320bb3e6ddac1f954ff5e4ec4bc1ea6240b
-EBUILD libparserutils-0.2.4-r1.ebuild 934 BLAKE2B 378fec1f77551f4e4db9c7f252c3c28e8f5c7f2e8f6c7eb5851ea5d94163a5dce7bf76e657ada03ba45e2dcf071437a7f1a6acd9d1855e5f90664e1c91f824df SHA512 cbca327cbe72cfc78d552051439d3254da9c64239fc2ba9cc6f2cf585e33ebd75c7b7be48836dba461a40125ae60ca5576d304d4783cb959868b59af00fb673f
+EBUILD libparserutils-0.2.4-r1.ebuild 941 BLAKE2B 6aa42423fb0351a1d0d2d29ef53a3b5dca9a889290b7129daaae8c1397aaffc106da2cf878f6b9a188d2da7802d33fa4643633cf26c781aae9307710bec39231 SHA512 0673b7a4d2a59a5ccbc1fd55a2897eb1b958271f3f41161c33d9c8b62587f8942c4b164155f920f06eede93b872da97395aaea9e55ab9c006d2136bb1881dfd0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
index 2083bdfe9ea9..f14d887ac486 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index 1fff7f0447be..f2bfd4f78da3 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,5 +1,7 @@
 AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71
 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126
 DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d
+DIST librep_0.92.7.tar.xz 651344 BLAKE2B 3a0e9a3eef0afa2e095537dfc307418ba87ce7a9baabdba262fd9a24b71cc6577fe1282412da495d56bf22007f1931c5b834f5bcf4c5ebe87d6b43a4975d630e SHA512 752cb2da31457200b5896f70ce24a097b261b996da25998cd78a777f982597473afce1a216f449a4a969d29b1678bf54e2f148e86de6f9548eeb5cfd530ae377
 EBUILD librep-0.92.6.ebuild 1506 BLAKE2B 96adfcb03ac626268728915315b75cc72a829978049036fe05f0b88011289661ea127869fc0e1f98fa35567ffb45ca2d7346669e4a27e5c37b55687d29af649f SHA512 b14d9fb9778d682b0d68c1c9a6b7d4f60717f3a554ccfb4ab5cc3d6f50adda342cfdf801ea85b463e8aa8fe006ec43a105dd4bd5b0a323e09d0ca8298b26a393
+EBUILD librep-0.92.7.ebuild 1586 BLAKE2B dbf6fc55544ebf3b9190a2e768a68710072a23955698a20997ad0e4aa0adf2048ce0874d38f2f1eceae534e2b71d6aa9215af4591f8835dc45f30c4180256cae SHA512 0b2dfe4b28dec15b1ef612c5d587a5651e300d26a6d4222f3a02a1185e3f8ba7bc9849b4f4380c2912dcb992f47bcd1d8efbeb0e0b4ae2832119126545f5f1aa
 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411
diff --git a/dev-libs/librep/librep-0.92.7.ebuild b/dev-libs/librep/librep-0.92.7.ebuild
new file mode 100644
index 000000000000..829d45fb63d6
--- /dev/null
+++ b/dev-libs/librep/librep-0.92.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Shared library implementing a Lisp dialect"
+HOMEPAGE="https://sawfish.fandom.com/"
+SRC_URI="https://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs gmp readline"
+
+RDEPEND="
+	>=sys-libs/gdbm-1.8.0
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gmp? ( dev-libs/gmp:= )
+	readline? ( sys-libs/readline:0= )
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.92.0-disable-elisp.patch
+)
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_prepare() {
+	# fix #570072 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+
+	# The configure script is missing from this version.
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gmp) \
+		$(use_with readline) \
+		--disable-static \
+		--libexecdir=/usr/$(get_libdir) \
+		--without-ffi
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		elisp-compile rep-debugger.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
+
+	dodoc doc/*
+
+	if use emacs; then
+		elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index f7e44913d30c..7389e68702e9 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,3 +1,7 @@
+AUX libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch 4565 BLAKE2B a0df14afa6d95e36f75d9c74ddff9fed42a54ef3c0320e095f47cb7c1fbd4d29bfee870779aaa19a64663f18227877c79a47469c44338d6db528725ea0eb1e69 SHA512 f8a5fc3810e96bca2c9a4221f01b66177657f294bbf1537643551a1a6c0a816ef865e23030913196667dc21b10423c0cced2eba3e6667acdc6312a9376c27884
+AUX libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch 6793 BLAKE2B 5462fc0a5ebe83a3c560519cb821b90b7c6b490c6a8046ea131cdbb5a65068b63d1edde55c5f80a967492a2615c07d049e496afbeb2a348a4186de885b65293a SHA512 8e570a081f24c19afb65d04b17c07680967453d29697b7fd3af72dff1bdf99e92f03e19b290db992859a7bd6665651c0bc90117656d016266fd289aa2afd6db8
+AUX libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch 3972 BLAKE2B f2f0e3a93c36adaa9e8cef7bb6e6ee723408acd26046a7bb4d0ffb1361502aa7c6a3316e2d8df5225ab0651e1aac0e84e03186bc0aa83c98d21d8f0be220a30d SHA512 36975108af1f1a5914e6b35bff00f7ed63e5b349cf7433687d23faa87bf1072ffa779c35313feaba50c6758fee6d66ccdc2f151ecdb50cf4606fbedd518308a9
+AUX libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch 2324 BLAKE2B 2d132eecdd410889ebf2452f83b24a6f9a8df53769d63cfcb0a4b5ab62d2cbd096b82208e73691d030a07968937c899e1dc606a492ceb68d4739a3a204c8808a SHA512 0f290bf4cd2a83176158bf0c67d1be6ea405cb7133ea2d83c5b86b05370b208e6266a050d49c4e5954e8da76eb4d15f24b8238625483d5f4c0d6a20061febf79
 DIST libtpms-0.7.0.tar.gz 1203837 BLAKE2B ca5a3b78dc63c09c4ff084124838fedeb5be0580f709ad6165680159ba7ba4b1f751b9fbc67f6b5a8f39b82bdd420afb47087412a47b72cbe5b418a97a4860fe SHA512 92d1eb5d1a1cae08e97cceaca56fc9bc6d43c54a93edae2accf19807a4e93e19d88064a0b11db796c79d32c821e6b320ebbacb65cd20da3e5b1205f3b861cef2
-EBUILD libtpms-0.7.0-r1.ebuild 663 BLAKE2B fede09b0b2dc21512c6b36c29764d38d3171887ff58ca893c52f21c7ae8734c598ba0e6b12f550becc154a59181d86f86c9207c40accfa56f9cbd971140364e8 SHA512 653431c4728c6efa1f0e0449f2ae41b5791806afc00e8f53e31b0460b4fc947498c245d928c30705c2b2911206dfa06da4877b425a4561fbbcd602051cd0d398
+EBUILD libtpms-0.7.0-r1.ebuild 958 BLAKE2B 0fcfec0ab17ca845399bc857776e2ef6bf4e9f47dc23e90aa80792d0a70f09fdc4dc7047ffb2a7662002554f93c4e0e6d18fbd0d0e5fce7338e3ad4ce7c94ab3 SHA512 8b079683c1a0aef0f925bf3199e0d464b0e83f62f6c9c26187a02e14614e6e142ff6e637da99d0468ed5470291ffa8ca3c57351433fd325130478c0951f58834
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
new file mode 100644
index 000000000000..9e7af9e88ed3
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
@@ -0,0 +1,105 @@
+From 1cdd950e7342240ed8edc695372365cf57fbc6cb Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Date: Thu, 17 Oct 2019 10:19:23 -0400
+Subject: [PATCH 2/2] tpm12: Fix potential buffer overflow in filename creation
+
+Fix a potential buffer overflow bug in the creation of filenames
+that were using sprintf() rather than snprintf(). The buffer overflow
+could occurr if the buffer is longer than 4096 bytes. The state path
+may alone be 4096 bytes and could possibly trigger the overflow.
+
+Swtpm for example is not affected from this since it uses the callbacks
+that are invoked before the faulty function is called.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_nvfile.c | 43 ++++++++++++++++++++++++++++++++----------
+ 1 file changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/src/tpm12/tpm_nvfile.c b/src/tpm12/tpm_nvfile.c
+index c8e7bcf..0268bd0 100644
+--- a/src/tpm12/tpm_nvfile.c
++++ b/src/tpm12/tpm_nvfile.c
+@@ -70,7 +70,8 @@
+ 
+ /* local prototypes */
+ 
+-static void       TPM_NVRAM_GetFilenameForName(char *filename,
++static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,
++                                               size_t filename_len,
+ 					       uint32_t tpm_number,
+                                                const char *name);
+ 
+@@ -189,7 +190,10 @@ TPM_RESULT TPM_NVRAM_LoadData(unsigned char **data,     /* freed by caller */
+     /* open the file */
+     if (rc == 0) {
+         /* map name to the rooted filename */
+-        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
++    if (rc == 0) {
+         printf("  TPM_NVRAM_LoadData: Opening file %s\n", filename);
+         file = fopen(filename, "rb");                           /* closed @1 */
+         if (file == NULL) {     /* if failure, determine cause */
+@@ -297,7 +301,10 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
+     printf(" TPM_NVRAM_StoreData: To name %s\n", name);
+     if (rc == 0) {
+         /* map name to the rooted filename */
+-        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
++    if (rc == 0) {
+         /* open the file */
+         printf(" TPM_NVRAM_StoreData: Opening file %s\n", filename);
+         file = fopen(filename, "wb");                           /* closed @1 */
+@@ -339,14 +346,27 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
+    state_directory/tpm_number.name
+ */
+ 
+-static void TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
+-					 uint32_t tpm_number,
+-                                         const char *name)      /* input: abstract name */
++static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
++					       size_t filename_len,
++					       uint32_t tpm_number,
++                                               const char *name)      /* input: abstract name */
+ {
++    int n;
++    TPM_RESULT rc = TPM_FAIL;
++
+     printf(" TPM_NVRAM_GetFilenameForName: For name %s\n", name);
+-    sprintf(filename, "%s/%02lx.%s", state_directory, (unsigned long)tpm_number, name);
+-    printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
+-    return;
++    n = snprintf(filename, filename_len,
++                 "%s/%02lx.%s", state_directory, (unsigned long)tpm_number,
++                 name);
++    if (n < 0) {
++        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), snprintf failed\n");
++    } else if ((size_t)n >= filename_len) {
++        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), buffer too small\n");
++    } else {
++        printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
++        rc = TPM_SUCCESS;
++    }
++    return rc;
+ }
+ 
+ /* TPM_NVRAM_DeleteName() deletes the 'name' from NVRAM
+@@ -380,7 +400,10 @@ TPM_RESULT TPM_NVRAM_DeleteName(uint32_t tpm_number,
+     
+     printf(" TPM_NVRAM_DeleteName: Name %s\n", name);
+     /* map name to the rooted filename */
+-    TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++    if (rc == 0) {
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
+     if (rc == 0) {
+         irc = remove(filename);
+         if ((irc != 0) &&               /* if the remove failed */
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
new file mode 100644
index 000000000000..e1c79875a02d
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
@@ -0,0 +1,108 @@
+From 464083396ae1d242fb2a26c1ab6e39971e82f47e Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Fri, 17 Jan 2020 19:01:24 +0000
+Subject: [PATCH 3/3] tpm12: Initialize a few variables for x86 gcc -O3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609
+
+The above gcc on x86 with -O3 reports the following false positives:
+
+ gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_nvram.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_nvram.Tpo -c tpm12/tpm_nvram.c -o tpm12/libtpms_tpm12_la-tpm_nvram.o
+tpm12/tpm_nvram.c: In function ‘TPM_Process_NVReadValue’:
+tpm12/tpm_nvram.c:1539:38: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      if ((returnCode == TPM_SUCCESS) && !isGPIO) {
+                                      ^
+tpm12/tpm_nvram.c: In function ‘TPM_Process_NVWriteValue’:
+tpm12/tpm_nvram.c:2323:6: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+   if (!isGPIO) {
+      ^
+
+gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_process.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_process.Tpo -c tpm12/tpm_process.c -o tpm12/libtpms_tpm12_la-tpm_process.o
+tpm12/tpm_process.c: In function ‘TPM_Process_GetCapabilitySigned’:
+tpm12/tpm_process.c:5089:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      returnCode = TPM_ProcessAudit(tpm_state,
+                   ^
+tpm12/tpm_process.c: In function ‘TPM_Process_SetCapability’:
+tpm12/tpm_process.c:5309:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      returnCode = TPM_ProcessAudit(tpm_state,
+                   ^
+tpm12/tpm_process.c: At top level:
+
+gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_transport.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_transport.Tpo -c tpm12/tpm_transport.c -o tpm12/libtpms_tpm12_la-tpm_transport.o
+tpm12/tpm_transport.c: In function ‘TPM_Process_ReleaseTransportSigned’:
+tpm12/tpm_transport.c:2810:42: error: ‘t1TpmTransportInternal’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+  returnCode = TPM_TransportLogOut_Extend(t1TpmTransportInternal->transDigest,
+                                          ^
+
+This patch initializes the variables.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_nvram.c     | 4 ++--
+ src/tpm12/tpm_process.c   | 4 ++--
+ src/tpm12/tpm_transport.c | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/tpm12/tpm_nvram.c b/src/tpm12/tpm_nvram.c
+index 1b9c005..620944e 100644
+--- a/src/tpm12/tpm_nvram.c
++++ b/src/tpm12/tpm_nvram.c
+@@ -1288,7 +1288,7 @@ TPM_RESULT TPM_Process_NVReadValue(tpm_state_t *tpm_state,
+     TPM_BOOL			ignore_auth = FALSE;
+     TPM_BOOL			dir = FALSE;
+     TPM_BOOL			physicalPresence;
+-    TPM_BOOL			isGPIO;
++    TPM_BOOL			isGPIO = FALSE;
+     BYTE 			*gpioData = NULL;
+     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
+     uint32_t			s1Last;
+@@ -2000,7 +2000,7 @@ TPM_RESULT TPM_Process_NVWriteValue(tpm_state_t *tpm_state,
+     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
+     uint32_t			s1Last;
+     TPM_BOOL			physicalPresence;
+-    TPM_BOOL			isGPIO;
++    TPM_BOOL			isGPIO = FALSE;
+     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
+ 							/* temp for noOwnerNVWrite, initialize to
+ 							   silence compiler */
+diff --git a/src/tpm12/tpm_process.c b/src/tpm12/tpm_process.c
+index d6a3b8e..c433621 100644
+--- a/src/tpm12/tpm_process.c
++++ b/src/tpm12/tpm_process.c
+@@ -4844,7 +4844,7 @@ TPM_RESULT TPM_Process_GetCapabilitySigned(tpm_state_t *tpm_state,
+     unsigned char *	inParamEnd;		/* ending point of inParam's */
+     TPM_DIGEST		inParamDigest;
+     TPM_BOOL		auditStatus;		/* audit the ordinal */
+-    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
++    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
+     TPM_BOOL		authHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
+     TPM_SECRET		*hmacKey;
+@@ -5144,7 +5144,7 @@ TPM_RESULT TPM_Process_SetCapability(tpm_state_t *tpm_state,
+     unsigned char *	inParamEnd;		/* ending point of inParam's */
+     TPM_DIGEST		inParamDigest;
+     TPM_BOOL		auditStatus;		/* audit the ordinal */
+-    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
++    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
+     TPM_BOOL		authHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
+     TPM_SECRET		*hmacKey;
+diff --git a/src/tpm12/tpm_transport.c b/src/tpm12/tpm_transport.c
+index 2261670..7b9c520 100644
+--- a/src/tpm12/tpm_transport.c
++++ b/src/tpm12/tpm_transport.c
+@@ -2599,7 +2599,7 @@ TPM_RESULT TPM_Process_ReleaseTransportSigned(tpm_state_t *tpm_state,
+     TPM_BOOL			authHandleValid = FALSE;
+     TPM_BOOL			transHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA	*auth_session_data = NULL;	/* session data for authHandle */
+-    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal;
++    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal = NULL;
+     TPM_SECRET			*hmacKey;
+     TPM_KEY			*sigKey = NULL;		/* the key specified by keyHandle */
+     TPM_BOOL			parentPCRStatus;
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
new file mode 100644
index 000000000000..309c78b3d1eb
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
@@ -0,0 +1,74 @@
+From aab357515eda564500290a4b3f542d2b4609af4f Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Tue, 14 Jan 2020 18:05:06 -0500
+Subject: [PATCH] tpm12: Initialize some variables for gcc ppc64el compiler
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc (Ubuntu 9.2.1-21ubuntu1) 9.2.1 20191130
+
+The gcc compiler on Ubuntu Focal reports several false positives for
+potentially uninitialized variables:
+
+tpm12/tpm_session.c: In function ‘TPM_Process_SaveContext’:
+tpm12/tpm_session.c:3229:19: error: ‘tpm_auth_session_data’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 3229 |      returnCode = TPM_AuthSessionData_Store(&r1ContextSensitive, tpm_auth_session_data);
+      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateManage’:
+tpm12/tpm_delegate.c:1787:49: error: ‘familyRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 1787 |  if ((opCode != TPM_FAMILY_CREATE) && (familyRow->flags & TPM_DELEGATE_ADMIN_LOCK)) {
+      |                                        ~~~~~~~~~^~~~~~~
+tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateUpdateVerification’:
+tpm12/tpm_delegate.c:3575:48: error: ‘d1DelegateTableRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 3575 |      d1DelegateTableRow->pub.verificationCount = familyRow->verificationCount;
+      |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All of the variables are initialize under the same condition as they are
+accessed.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_delegate.c | 4 ++--
+ src/tpm12/tpm_session.c  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tpm12/tpm_delegate.c b/src/tpm12/tpm_delegate.c
+index 51d12f3..37ebc02 100644
+--- a/src/tpm12/tpm_delegate.c
++++ b/src/tpm12/tpm_delegate.c
+@@ -1629,7 +1629,7 @@ TPM_RESULT TPM_Process_DelegateManage(tpm_state_t *tpm_state,
+     TPM_SECRET			*hmacKey;
+     TPM_SECRET			savedAuth;		/* saved copy for response */
+     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
+-    TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
++    TPM_FAMILY_TABLE_ENTRY	*familyRow = NULL;	/* family table row containing familyID */
+     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
+ 							/* temp for noOwnerNVWrite, initialize to
+ 							   silence compiler */
+@@ -3360,7 +3360,7 @@ TPM_RESULT TPM_Process_DelegateUpdateVerification(tpm_state_t *tpm_state,
+     TPM_DELEGATE_INDEX		d1DelegateIndex;
+     TPM_DELEGATE_OWNER_BLOB	d1DelegateOwnerBlob;
+     TPM_DELEGATE_KEY_BLOB	d1DelegateKeyBlob;
+-    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow;
++    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow = NULL;
+     TPM_FAMILY_ID		familyID = 0;
+     TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
+     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
+diff --git a/src/tpm12/tpm_session.c b/src/tpm12/tpm_session.c
+index 5e7b708..15b977f 100644
+--- a/src/tpm12/tpm_session.c
++++ b/src/tpm12/tpm_session.c
+@@ -3044,7 +3044,7 @@ TPM_RESULT TPM_Process_SaveContext(tpm_state_t *tpm_state,
+     TPM_STORE_BUFFER		b1_sbuffer;		/* serialization of b1 */
+     TPM_STCLEAR_DATA		*v1StClearData = NULL;
+     TPM_KEY_HANDLE_ENTRY	*tpm_key_handle_entry;	/* key table entry for the handle */
+-    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data; /* session table entry for the handle */
++    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data = NULL; /* session table entry for the handle */
+     TPM_TRANSPORT_INTERNAL	*tpm_transport_internal; /* transport table entry for the handle */
+     TPM_DAA_SESSION_DATA	*tpm_daa_session_data;	/* daa session table entry for the handle */
+     TPM_NONCE			*n1ContextNonce = NULL;
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
new file mode 100644
index 000000000000..539ddb243d07
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
@@ -0,0 +1,53 @@
+From f3f78c72a5b6ef42119188ac5af73bb3a0a8bbba Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Date: Tue, 12 May 2020 13:41:53 -0400
+Subject: [PATCH] tpm2: Fix a gcc 10.1.0 complaint
+
+This PR addresses issue 133: https://github.com/stefanberger/libtpms/issues/133
+
+bin/sh ../libtool  --tag=CC   --mode=compile x86_64-pc-linux-gnu-gcc \
+  -DHAVE_CONFIG_H -I. -I..    -include tpm_library_conf.h \
+  -I../include/libtpms -I../include/libtpms -fstack-protector-strong \
+  -D_POSIX_ -DTPM_POSIX -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 \
+  -I ./tpm2/crypto -I ./tpm2/crypto/openssl -g -O2 \
+  -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 \
+  -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 -DUSE_OPENSSL_FUNCTIONS_RSA=1 \
+  -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign \
+  -c -o tpm2/libtpms_tpm2_la-NVDynamic.lo `test -f 'tpm2/NVDynamic.c' \
+  || echo './'`tpm2/NVDynamic.c
+libtool: compile:  x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. \
+  -I.. -include tpm_library_conf.h -I../include/libtpms \
+  -I../include/libtpms -fstack-protector-strong -D_POSIX_ -DTPM_POSIX \
+  -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 -I ./tpm2/crypto \
+  -I ./tpm2/crypto/openssl -g -O2 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 \
+  -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 \
+  -DUSE_OPENSSL_FUNCTIONS_RSA=1 -Wall -Werror -Wreturn-type -Wsign-compare \
+  -Wno-self-assign -c tpm2/NVDynamic.c  -fPIC -DPIC \
+  -o tpm2/.libs/libtpms_tpm2_la-NVDynamic.o
+tpm2/NVDynamic.c: In function ?NvNextByType?:
+tpm2/NVDynamic.c:126:10: error: ?nvHandle? may be used uninitialized in this function [-Werror=maybe-uninitialized]
+  126 |  *handle = nvHandle;
+      |  ~~~~~~~~^~~~~~~~~~
+tpm2/NVDynamic.c: At top level:
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm2/NVDynamic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tpm2/NVDynamic.c b/src/tpm2/NVDynamic.c
+index 32f46bb..4381658 100644
+--- a/src/tpm2/NVDynamic.c
++++ b/src/tpm2/NVDynamic.c
+@@ -114,7 +114,7 @@ NvNextByType(
+ 	     )
+ {
+     NV_REF           addr;
+-    TPM_HANDLE       nvHandle;
++    TPM_HANDLE       nvHandle = 0; // libtpms changed: gcc 10.1.0 complaint
+     while((addr = NvNext(iter, &nvHandle)) != 0)
+ 	{
+ 	    // addr: the address of the location containing the handle of the value
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
index b13d07d50237..a64f5e30012b 100644
--- a/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
+++ b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
@@ -17,6 +17,13 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tpm12-Initialize-some-variables-for-gcc.patch"
+	"${FILESDIR}/${P}-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch"
+	"${FILESDIR}/${P}-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch"
+	"${FILESDIR}/${P}-tpm2-Fix-a-gcc-10.1.0-complaint.patch"
+	)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index 7fc046713a7f..a95d33f0798c 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -2,5 +2,5 @@ AUX 1.4-asneeded.patch 533 BLAKE2B b2f1202d6f788c41f4e96c2a9b2354abe922fda568ebc
 AUX 1.4-doc.patch 539 BLAKE2B fbd5b0c726273bec32d7643edfce37bf4295fd12c92664bba6c5136cbfda4e50c3f260fe87577dd8eb32a3e847ffac08dfae376345675b3732d04e92f08cf744 SHA512 7ca3d028c86c6938a51f44f9d7f769702b5a8732bbd98ac9abaee916f25b2b7bad69883844a36a4add055838ce67e779ccc02634aed05bea2704c20b59b5fb67
 AUX 1.4-mpi.patch 652 BLAKE2B 0ad1e3ea9b79178ba8e1d16efc1fd6b59b931773faa0add3519a917164d4d62bbe158e05881d8e077c3ff375cefec2851ddbb160b2d64fac299cde145c2eb3d1 SHA512 73d00caccb02f5fa94336c63a653e99bccdeebd39d6e10d4c8eaab95a8e4f4b90ac5d1232d781e25e5079c7fdb8038471078cc63ba638579f523e27816e49d43
 DIST maloc-1.5.tar.gz 794138 BLAKE2B 28b5b6a3bb9769ead517e181c9098762378dea7c8b8ddddaf809c958a553a4e96ee654d477a974c769b027c57c93b84ec5e447af142489b59d2ce8800b5631a6 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c
-EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B fe4d5573f7110b48982722fbcf07146b76dc1af396b81910caadae49a262af1a95d7b93f8adccf5ef28eefa3fa6a8e4c841381f14f34f0906f7c814d7a4445b8 SHA512 c0b69bf4eba7e579f4e0fbf00dffd35457cb93d71e25908febc29efdb20154a176bc62337b8c2abe70b35c8283bbbc8f78142e204529459738ca5649bf2ee4f3
+EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B 89fd133e2ded56a3c6fb919b4c0578ffa721f9fe1df05d500a1c7efe02f63b35dc0fba0f255f8dd7d628a0dc5b7d6723a703d2b1f883e321cc92e3d820d9ca2e SHA512 75b23865c0516751d547942681c768c5503613351ed79ef8ae5a63adbc64977d560b6a6532275cfe5f5aec16dfeffa644a7fece4aa82c137b96df38ad1f39baa
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index a28998d13c5e..09db961acc5c 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE="doc mpi static-libs"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	sys-libs/readline
+	sys-libs/readline:0=
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 613a235ec69f..0b091c38b5f6 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.12-r2.ebuild 1289 BLAKE2B 65b27579e5479f321cd239a96f0bcd6ed28370c7500b5adbf25c45c4989e7cf1f653409727eecd14726ee6de007777d6776cab463c736760bb648a09bd3d1991 SHA512 6a9b659fc0b7d28183c377ffe9bd78894d42d4f927e5933646ea14ec8ff99ebb245106b251e32c1d98fa5a40c238f8b178f3d225494e84994478920a891d9caa
-EBUILD ocl-icd-2.2.12-r3.ebuild 1201 BLAKE2B f59058b5a2713b31df98d6d3f6a6f392e9b05411e7685b24c5ab9535b20b6e2fc1d378b194a6d73cfc53ee5f11600a77a51d6ce4a969455ace9ad59e49f4af35 SHA512 1e98b8d49f048986b44717f87ffa3b30a21d75be4e160c26ea809346cf58e3478d2eb7cc4e4955dbc1b01a290a19e35eb9d23dd844fde96ad45657bd64b06884
+EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4
 EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 05ddc8149f9a60bd1de2862be075fbd9d815352e68bc1c35315d72c2d32a7a54de4da2786adca0e919f46a2e1686e06112d6f666c97a898a971fb04c8cde4136 SHA512 9852a177d53bcdaabc0f36b6bcbcfcef587e34e97131cd4e97d5494efa58abb34595e57defc0916596f9a7035b1d4bf84daa964462458fc6a6b025deb2e624a4
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index efbc9bb4b363..73e2edae5f4f 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
 SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 3a4cceeda6aa..c544d9f72708 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,3 @@
 DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
-EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1069 BLAKE2B 7bca06f996bed7076c354ebeea422bdf3fb8fb8ec71666f7ca7f95ed93c16dc3c8fc8803710ad1e4858d191b2708fe94761f6f87116fa2a30b64ab8793ed1d4d SHA512 e5f06b6490ff365e42693531c6f5b821951af4f4fefd31ac8091e09ed17f607877f9683e3fe4d1f3b92dbc2194a1e6051242aee0637b32d42da1d0594f8e7028
+EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
index 334c9390cc27..566faffb1de0 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index c2ce058bb28c..3e03259e2bf5 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,3 +1,3 @@
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
-EBUILD pcl-1.12-r1.ebuild 312 BLAKE2B 4edd45300c9879a8e5b9dc85574774f43fb8eae5e6ed6809125894a853bb5b0267d44e52d965cd7be412373705d2b0b6187e31527fb2574b1361bcc61e5c0b07 SHA512 45be834f9ab787079aa279638fea52f237f256d8c52729367fa477ee42bdd2b774503f6dbb34402a1436210b93fb846b5420508523698edf3304a79ee669dcd7
+EBUILD pcl-1.12-r1.ebuild 311 BLAKE2B c1ac7a7b997d5c4fca7f6904b0962d7b1de4234d0b42b17fae40373a9fbe5eba291e5f70a30c009bfc6b83539f4cb35a005e4eff4805f5814103ead99b7ca5ee SHA512 daf52b1308cca40406cdd0612de145686cf6325a35957c339de05171b0cac18597ff844fc4c9225ff4d3ed0d33ca55c329ad9515fc24473336affefb4b01dcb9
 MISC metadata.xml 312 BLAKE2B dfa077775d15071c5ec983c38cc443e693d0c2998b583c56a685145a523ee58cb473a872d418018e8366fa73e2cef4235315fc45c9291c93c5dbf4f1388d50d6 SHA512 e90839ce3cf7ce5848f665f2fb70b8ce8619db0c6b0b005f37765fc621a7bbec305680ea4d4cf10111220d390a622c00c43f239530640d3328fb7aeb64a58582
diff --git a/dev-libs/pcl/pcl-1.12-r1.ebuild b/dev-libs/pcl/pcl-1.12-r1.ebuild
index 7131adfcab25..d67d3078ccea 100644
--- a/dev-libs/pcl/pcl-1.12-r1.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r1.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://xmailserver.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index b1de11412109..3e564c0fe853 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -2,12 +2,6 @@ AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf968
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
-DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
-DIST pigpio-73.tar.gz 385233 BLAKE2B 5b58b399ffccab456d64decea4190e326c70cfe36b5513d0c69aa68c5ebfe2667ec5b4a028d19ec987d948c7b94dd23d67903bbae901d61f751dd606540324ea SHA512 bc6d2bbc2f2067c851a74a6137913b9abf2a7424bc2f78cf4086a1210f5c1116f71dcfa94a1268c137f4181e2db39af0bd2025caa1a7f98374b2043a166af746
-DIST pigpio-74.tar.gz 385851 BLAKE2B 7487808407972815a5c2123c8cf97f12aa241f4f7c8bc1610d8a31e11d5946aba52a9c452c6c552c27599a4f9f57ec1e03a17a6a5a4157bec7d3d302e9abf680 SHA512 8bd2c3a1c9b8e3287120f6c45d281e2e93020fe50080b3ba8d454a255a5b378b4d08f372bcc3ce407bf0579103916ff20b7741e1ed6c05e09b08a948827a7a60
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
-EBUILD pigpio-72.ebuild 1091 BLAKE2B 2ad0df61c154728dc256c554caf6aff8bc4aa7bf71d798e32fcb681f0c65d0077a09d40a96c7e07de2a4da99caeba744dd89ceafbea1d16b8fb9af28b95418fd SHA512 81b9b2e7b5b05ee6d659aeb52d364359d3f5ee8fe7dcaf9fb4de910c0db49cea94472909f1bc0185674be55f073f0ba17b091c1256c9151ca2fbc605f4aa142f
-EBUILD pigpio-73.ebuild 1093 BLAKE2B 37fa60cb0c9194f07feafaa953d3d21629ed48c91fe5fce67e447f5ee6e12eef3c7d1d9ecefb648aece77081ed40a567c542eef584abc2872c350811a4143d72 SHA512 4ecf45c2d6a9f798b23ea7c24cd07e011028b1c3c090e49bd0ab0fe82257423ba478492d458c580e8571e3d01fa379979e5d5fee40b3ab87d43e7dca75ca10ed
-EBUILD pigpio-74.ebuild 1099 BLAKE2B e16aa6e02499ac1cb9207f4dd0bdf42fa58af0a60f8c03ef38dece5dc4bdf84317afb8468c4b524d55ebbc6089d2362b3ee79b9584804a900b9476c19c0efefb SHA512 828bb572843c59322a062cb4c1e470b4ba6b89c4cc6a449438a582cd645fea66448ab1d554c1c36197914eb238d3823fe03574dfa832e06732de5ab09c49fd9e
 EBUILD pigpio-76.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-72.ebuild b/dev-libs/pigpio/pigpio-72.ebuild
deleted file mode 100644
index af5f01ca226d..000000000000
--- a/dev-libs/pigpio/pigpio-72.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-73.ebuild b/dev-libs/pigpio/pigpio-73.ebuild
deleted file mode 100644
index ca8b1bd2909d..000000000000
--- a/dev-libs/pigpio/pigpio-73.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
-SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-74.ebuild b/dev-libs/pigpio/pigpio-74.ebuild
deleted file mode 100644
index 738bf586aaa1..000000000000
--- a/dev-libs/pigpio/pigpio-74.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 systemd toolchain-funcs
-
-DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
-HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html https://github.com/joan2937/pigpio"
-SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
-		mandir="${EPREFIX}/usr/share/man" install
-	einstalldocs
-	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
-	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
-	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
new file mode 100644
index 000000000000..b92bd3ca2e94
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -0,0 +1,3 @@
+DIST plasma-wayland-protocols-1.0.tar.xz 38020 BLAKE2B 8064a526d3e3e4b36f7c612744285181ba96bdf4c0992ba7d164ea98e629b3456c7efedd2e3dbbf76a3cbd42664d91eea3e485bd67303e1db02964c7fc6158db SHA512 30ecbf9fbf9de7ee1d323fb43b0f4a05586e0f7d2c4d510e2300828e7a6a16e8907d8d2a835d4ecbb2d4d532641ea722ff6572403f767e0ac878b7fdb0897b08
+EBUILD plasma-wayland-protocols-1.0.ebuild 426 BLAKE2B 1dea46fd71017d3ca2559dc895b00c10b2e39e444f3ffa2d97e08203b24e585afa1b4aff35321a50062c22744416f2a70e786d63553e4d1e38aae80a3e7f79c0 SHA512 ceb58a023303995377200c77c9ef18552902c744bbfd8a91ed98f8607099662f27fb920c3d57f6abaf77cc2394a2c6ec94a2f6a2a53b2a5d603556f2195fb2e1
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/metadata.xml b/dev-libs/plasma-wayland-protocols/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
new file mode 100644
index 000000000000..e3af96585cc1
--- /dev/null
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_NONGUI=true
+KFMIN=5.69.0
+inherit ecm kde.org
+
+DESCRIPTION="Plasma Specific Protocols for Wayland"
+HOMEPAGE="https://cgit.kde.org/plasma-wayland-protocols.git"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 3ef46b02d4eb..5863c2ed388c 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,6 +1,3 @@
-AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
-AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
-DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
-EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B da0b3b6266786d15f0fef4a873a9391659df3a17707dac82549e9b8014154f03e5c8dc6b3ef1df8de11bff39bba1a527b4b1aa18d74f44c4ba9507127021eb82 SHA512 0be10099b28d0766e66d4ccc368d92d0fa76668b57ddcbe0e6f033e6dde53790c13f12b7a4468e1b6dfbcf64c25b091e3e99b6bb6fca25c7d0f2380a0bf6c95b
-EBUILD zlog-1.2.12.ebuild 625 BLAKE2B 7fdb101df894a485214f5efbdba5d7ed9055bb68872f26aace9a130934b9b4b0c957c0ff91d2cac780b159d61442c73e699132e7df7dea1cb56f21867083adfb SHA512 b04f73ec3974de6f045397c3b79f900cb68bd08b40da2c06e1556cd882d1ae514f966b3672dc60855da09feda1e4ca732ec7598817afdea93797541635b02913
+DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
+EBUILD zlog-1.2.14.ebuild 630 BLAKE2B 9214e1bec48b302cfe4129f31102e903bc6a4da626d2877df0946593d7c02dc1d403b730d28bd1189f875138e036ce11b56834bf0aa153c22ed4cc047590fa86 SHA512 e59cb6eb13a0939e634f2146084b8b169800f412b44cc5baba7e50a5fc8bd6be139ac1de14fbf9adf5363aaf2ee6c030f6df87c17a5ee781711416f1d6d07d13
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
deleted file mode 100644
index 4ce0a4b6d16c..000000000000
--- a/dev-libs/zlog/files/zlog-testsuite-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- zlog-1.2.12.orig/test/makefile	2013-09-25 04:38:42.000000000 -0700
-+++ zlog-1.2.12/test/makefile	2018-02-13 16:59:33.812131188 -0800
-@@ -1,3 +1,6 @@
-+CFLAGS := -O2 -g
-+CC := gcc
-+
- exe = 		\
- 	test_tmp	\
- 	test_buf	\
-@@ -24,10 +27,10 @@
- all     :       $(exe)
- 
- $(exe)  :       %:%.o
--	gcc -O2 -g -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
-+	$(CC) $(CFLAGS) -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
- 
- .c.o	:
--	gcc -O2 -g -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
-+	$(CC) $(CLFAGS) -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
- 
- clean	:
- 	rm -f press.log* *.o $(exe)
diff --git a/dev-libs/zlog/files/zlog_no_werr.patch b/dev-libs/zlog/files/zlog_no_werr.patch
deleted file mode 100644
index b01325db09d0..000000000000
--- a/dev-libs/zlog/files/zlog_no_werr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/makefile	2016-08-11 10:40:49.466873499 +0200
-+++ b/src/makefile	2016-08-11 10:40:59.626762850 +0200
-@@ -32,7 +32,7 @@
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- OPTIMIZATION?=-O2
--WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv
-+WARNINGS=-Wall -Wstrict-prototypes -fwrapv
- DEBUG?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG)
- REAL_LDFLAGS=$(LDFLAGS) -pthread
diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild
deleted file mode 100644
index 6e6621253781..000000000000
--- a/dev-libs/zlog/zlog-1.2.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
-HOMEPAGE="http://hardysimpson.github.io/zlog/"
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default_src_prepare
-	epatch "${FILESDIR}/zlog_no_werr.patch"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-}
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.14.ebuild
similarity index 87%
rename from dev-libs/zlog/zlog-1.2.12-r1.ebuild
rename to dev-libs/zlog/zlog-1.2.14.ebuild
index 2dcde049b63d..66b2ba8509c2 100644
--- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild
+++ b/dev-libs/zlog/zlog-1.2.14.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}/zlog_no_werr.patch"
-	"${FILESDIR}/zlog-testsuite-flags.patch"
-)
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index af60e9006f3b..5daadb4d4d3e 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index a55aa41109d0..b758291bb663 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,3 +1,3 @@
 DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
-EBUILD camlp5-7.11.ebuild 989 BLAKE2B 06d73ce9f0d3ea93749d88fe615dc8e2078f356f9254828430fed8a19786b25fb014efdaa36c13ae905badf8aa681f62f35d01cc863ece5f25b0662548461131 SHA512 904e20e16ebf0ef91ce78821f92686891501dd7e86e3eacdf7a89331d8cac2e37af2f52c345852dd0aad25fa72c9290266d46c354d7e81ef0f09e20baa53ff39
+EBUILD camlp5-7.11.ebuild 1007 BLAKE2B a8f26da86128f38f61b0d30255ae11dfabbfd7553c02dc78fea9e6c7afcc9836ba0165649064613085065cc302c95f7980af02f9ce151c94836308b5b6261072 SHA512 33405d07149ef4041789ba5c780b93cbc611be4eeec37f4d8d0efec293eac22e65ae87265d6eed341fd5abe721b97804fafcb5124acd936088b49d86aaf892db
 MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11.ebuild
index 91b242f306d0..12f10b2cd865 100644
--- a/dev-ml/camlp5/camlp5-7.11.ebuild
+++ b/dev-ml/camlp5/camlp5-7.11.ebuild
@@ -19,7 +19,8 @@ DEPEND="dev-lang/ocaml"
 RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED=(
-	/usr/bin/camlp5{o,r}.opt
+	/usr/bin/camlp5o.opt
+	/usr/bin/camlp5r.opt
 )
 
 DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index b0a58bfff746..999bb389c3ea 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,7 +1,8 @@
+AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.10.ebuild 1884 BLAKE2B e64363193707f30dc7c85c68a80aa83700a4033a1ca08c3f51e5deb685e67523ab0507cf6a9e0c10e31522783f856bcb34e7ac5feac33c222e3893ff629cd4e1 SHA512 ee518a55a66c7876464034435516192af8c91e338fbdec2dbd0575c1eb2fe68f0cbde4fcc23f8814a430296f4e59f474b275b50c4c033a92f8d19725f85c4fbc
+EBUILD lablgtk-2.18.10.ebuild 1968 BLAKE2B 3b337ec377bf85ca60cb18197b5d702f3942056e45dd3ed5d8ea4b6dda727b4418fb5e6a759235955b8b31f86aab39cbac72705a9366a428bec1c281d4e9e50c SHA512 fcc1dd98df79f3416e0641a3a4f8cda052172822802fd41461dc6701c1e83f6a6b56ef289676c6fe41df2eb99667cf462ab10ba04cb1be3e761f064ae54c1c23
 EBUILD lablgtk-2.18.5.ebuild 2327 BLAKE2B debd856df94beb8f43f803b38f3a07c9b30e2636152be3af9e39defb3a78551c08e748e2096c4014ee22046a7cb121650271caee10ed6db7119bb140b5db7300 SHA512 e2b0225484f28971d02c02dde960095a60a0ef2db2b25263ad678a3f7a33473bdeafd96e100d671a11da5fe331d0c69f092fc23d64ffcf07e0d1d2ddfe60b268
 EBUILD lablgtk-2.18.8-r1.ebuild 1717 BLAKE2B 0f951f152a005cbe10ba78e829215087f3d32f27fcddba88af0ab943f23e30d053f3fbd364900f689aacce7896800a31731c87489109b6612b1eacb8fe802036 SHA512 db05d897d25054b497a16a531e7d13fb19de2e5f74aa3faf162cfc2d960e61b106511bec89a332586cc96633a1a92820bf9c03da91edbe0b7073424335177c32
 MISC metadata.xml 463 BLAKE2B 79b09024eeae81c18bf584e6341773512c569e348cea23294fd1354bbc6f5ac4da24ffa2a00cf89c44fe7b3af4b8214d6c53f2b36e7c2aca0fedbe2a7d944c97 SHA512 c4dc8d0ea137fa1d8694702fec3dc42eec83967f061c72097b77032ccfe8e6f47450d7a7486647acdf0387ac3d2cf8c028b772d71943d402bec5a7bd976a0ce1
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
new file mode 100644
index 000000000000..9cbc94a8a036
--- /dev/null
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.10-cflags.patch
@@ -0,0 +1,97 @@
+--- a/src/Makefile	2020-05-14 22:01:09.565870733 +0200
++++ b/src/Makefile	2020-05-14 22:06:49.081621996 +0200
+@@ -18,6 +18,7 @@
+ 
+ include $(CONFIG)
+ #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations
++CFLAGS=
+ 
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
+ 	$(THINITOBJS) build.ml
+@@ -45,14 +46,13 @@
+ 
+ ifdef DEBUG
+ COMPILER += -warn-error A-52
+-CFLAGS = -g $(GTKCFLAGS)
++OCAMLCFLAGS = $(GTKCFLAGS)
+ CUSTOM = -custom
+ #MLLINK += -cclib -lcamlrund
+ MLBYTEFLAGS = -g -dtypes
+ else
+-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
+ ifneq ($(TOOLCHAIN),msvc)
+-CFLAGS += -O
+ endif
+ endif
+ 
+@@ -65,9 +65,9 @@
+ THLINK = unix.cma threads.cma
+ 
+ ifdef USE_CC
+-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS)
++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS)
+ else
+-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose
++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose
+ endif
+ 
+ ifdef USE_GL
+@@ -123,7 +123,7 @@
+ CLIBS += liblablrsvg$(XA)
+ RSVGMLOBJS = rsvg.cmo
+ RSVGCOBJS = ml_rsvg$(XO)
+-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ)
++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ)
+ endif
+ 
+ ifdef USE_GTKSPELL
+@@ -140,7 +140,7 @@
+ opt::  lablgtksourceview.cmxs
+ endif
+ 
+-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS)
++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS)
+ GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo
+ GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO)
+ ml_gtksourceview.c: pango_tags.h
+@@ -179,7 +179,7 @@
+ endif
+ 
+ ifdef USE_GTKQUARTZ
+-CFLAGS += -DHAS_GTKQUARTZ
++OCAMLCFLAGS += -DHAS_GTKQUARTZ
+ endif
+ # Rules
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4
+@@ -188,7 +188,7 @@
+ .cpp$(XO):
+ 	$(CCOMPILER) $<
+ .c.d$(XO):
+-	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $<
++	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $<
+ .ml.cmo:
+ 	$(COMPILER) $(PRINCIPAL) $<
+ .mli.cmi:
+--- a/src/ml_gdk.h	2020-05-14 22:19:59.045394874 +0200
++++ b/src/ml_gdk.h	2020-05-14 22:20:06.694277819 +0200
+@@ -102,7 +102,7 @@
+ CAMLexport int OptFlags_GdkModifier_val (value);
+ CAMLexport int Flags_GdkModifier_val (value);
+ CAMLexport int Flags_Event_mask_val (value);
+-CAMLexport lookup_info *ml_table_extension_events;
++extern lookup_info *ml_table_extension_events;
+ #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key)
+ 
+ #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val)
+--- a/src/ml_gdk.c	2020-05-14 22:21:39.244861128 +0200
++++ b/src/ml_gdk.c	2020-05-14 22:21:57.571580518 +0200
+@@ -55,6 +55,8 @@
+ #define GDK_WINDOW_TYPE_HINT_DOCK GDK_WINDOW_TYPE_HINT_NORMAL
+ #endif
+ 
++lookup_info *ml_table_extension_events;
++
+ CAMLprim void ml_raise_gdk (const char *errmsg)
+ {
+   static const value * exn = NULL;
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index ad3698d27a55..780d515a5e01 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -26,6 +26,10 @@ BDEPEND="dev-ml/findlib
 
 DOCS=( CHANGES README CHANGES.API )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
@@ -46,9 +50,9 @@ src_configure() {
 
 src_compile() {
 	# parallel build crashes
-	emake -j1 all
+	emake -j1 all CFLAGS="${CFLAGS}"
 	if use ocamlopt; then
-		emake -j1 opt
+		emake -j1 opt CFLAGS="${CFLAGS}"
 	fi
 }
 
diff --git a/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0.ebuild b/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0.ebuild
new file mode 100644
index 000000000000..20351a93cf6a
--- /dev/null
+++ b/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.005
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Integrate Cairo into the Glib type system"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/cairo[glib]
+	>=dev-perl/glib-perl-1.224.0
+	>=dev-perl/Cairo-1.80.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.200.0
+	>=dev-perl/ExtUtils-PkgConfig-1.0.0
+"
diff --git a/dev-perl/Cairo-GObject/Manifest b/dev-perl/Cairo-GObject/Manifest
index 001a3063fa54..b953cbe2ee22 100644
--- a/dev-perl/Cairo-GObject/Manifest
+++ b/dev-perl/Cairo-GObject/Manifest
@@ -1,3 +1,5 @@
 DIST Cairo-GObject-1.004.tar.gz 16786 BLAKE2B f4369281f3b827ef232827b6efd553dbae6453aca621ab070a7bf3d3d43c893c2710b8afb4ae4ba4105310d6acf6c80f1819aa107767f3197e920b1980fbee1a SHA512 fa48e1f6466e0a9d6ebf44205f55459dc8af7b3e94d0cd93e4b4ab985969e6940f96926c485a70ecf2dc6fdc5896e743751fcb615cc5d2e614c091b8b5564bd9
+DIST Cairo-GObject-1.005.tar.gz 16790 BLAKE2B ffc49d320c74123faaa3cbde87cdafabf74d5d3d07f0f756f7319586052be84e2d57524a29a742060e21c7f1a6233dbefd672f68807d42b2afe3325464cf7f4a SHA512 45f1e3ff6f8a90347175c66e5a854acd22285cd48a9aa07344c046add283892d6188e88f69d64798dc5323cb17aa442853915ed2081b5ec4e2a735b89cd11b1e
 EBUILD Cairo-GObject-1.4.0-r1.ebuild 524 BLAKE2B a75c2ce06c12ed78a07696c1979b60eed5f6f6a4328a5b9f053525642a3f842bf432e48129da564533a1f1024b6ce4ba4b6763376457e5161a1bc01089a49fe2 SHA512 f08d6066149d1cfad45b8b901e445927caf2652a1b0603b4cbff6078aaf82e5873c56312f489126c96403f27fece57f41d180e2b155087b3b7262ece1adb3f4b
+EBUILD Cairo-GObject-1.5.0.ebuild 527 BLAKE2B db0bbafefcec807129074bb5c40aa4b3fe5c54811bf35443e1cfbfe7ca5c4b3727f79ae7e0a2970b83eebb0fd88340e09b946534afccefcb0f699bcb97612538 SHA512 175631f899dd563a56759d97b11d830628372714d07a83b8b187233be10145260b380025aa8fbe8ec8405914fd341e5a2cb319c2411940cdf3e07f6e08217dc3
 MISC metadata.xml 475 BLAKE2B a35e6ddca67ed7629cd0f633598479cf5096051c7663a81dbfb5cccdaa09b596667f0f1afa86dc690997387d3c225062e98d7bc8739086e535445c92e1452ff3 SHA512 8fafbcacc4e7568ba7dfc869aa673d887afde3b95c4b24fa4ef5bdfd09b25271f5afafe43bcf1963b8042e117e7156e7dbbd67fc4022311cef5604180af307af
diff --git a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
index 15cee516226a..5e4f5694d195 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 3129f4070162..813671d00fa5 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,3 +1,3 @@
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
-EBUILD IPC-Run-0.960.0.ebuild 755 BLAKE2B b9963242866ccd2325d95f7466a2f8f96298b6c655deb9422772448fabe6287706df7ddd61236d0954e980a90ef84846dd4092b3f5b0dbef8aa9601f87635ff2 SHA512 2d0ab946d9012919d9dee9bb4d056ec8dec8ecee140e8d82b700fcabe03ef6359ea3d65583023a5e14e7e7ec31e5fc3e3292c2197876c107b99032799b25d981
+EBUILD IPC-Run-0.960.0.ebuild 754 BLAKE2B b77b8f615aaf63700bb3f6a1436afd00b6d4743dd2e1f462c5e01cf67a5da28533e614d17d3178d634e56e73a5c519653c02c3788184ed26a45bc74076c0dc95 SHA512 c3a999825660a6e09855f2b4d5189c16fedd6f3ad61f9a5c26a92906ec2d1e94fd70e8181253d21ebf4a796780e7bf29650110b6da2be936739dcdfae0b7f68a
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index b7b6d88e4ada..78a28533c87d 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Time-Duration/Manifest b/dev-perl/Time-Duration/Manifest
index 0cc6f1700b2c..3b69fcfb1ba4 100644
--- a/dev-perl/Time-Duration/Manifest
+++ b/dev-perl/Time-Duration/Manifest
@@ -1,3 +1,3 @@
 DIST Time-Duration-1.20.tar.gz 15478 BLAKE2B f269d9667482712b952f5c29bc041efb9a85c0c8f93bb0ea6f0ab3cd0ced1259b41cfaaaad34146720b39863e3185c0d1f99fc3f0efe91f2a6e8db36d42ea390 SHA512 74bdcbc2b65061ad30540a95467de24f552235cea2367a7770309d9ffefeb35717f438e4f7ebf6a1d63f338cd714ffe16b3f45808514995db9753d643892d5f9
-EBUILD Time-Duration-1.200.0.ebuild 574 BLAKE2B 7bb04dedafaf66b6461aebb2e89b9dc3775c27306a2cb25a7434737a867d7a58e992dcc03ae1c908b6dc091b3c79f9c64dd8fc753e648435e5a69cf2ea2b0040 SHA512 e54189b4e76a429a3066563dbc931cca051d92433b29b140d3c283a3286d097548bd45f278baf154302ca90e1e4b40a34f16b06ff62163923f42e7c854df0e09
+EBUILD Time-Duration-1.200.0.ebuild 573 BLAKE2B 4d7d226e44ff3b7e3bdee724c0be40e1a010e22905c9b1685ca82c99eb79d0a117ee6b045d77356089b72dfea437d3518eb1dae23cd731068b5d8459ee3bed86 SHA512 6b078aa26e2b58f9d9270140983a478ac2a247866d39e6417ad86649a36b025054fa0437f1237c1f0d52766ccd2ea04af2bf17d508cc86f45d53c2c6262867b5
 MISC metadata.xml 398 BLAKE2B b2355ddcf44390ccbf80d078a43f399b7b581d7c315b096a97f9b6630bd8b4a4978111b01101c4f5c83260462d1fad835b185dcbee4ef106c7a54074993fc556 SHA512 d5e236b5e72e78eead20d8be89c8ef1340b9d250ff33ca6f200f7bd5370c2131d8eca112e932726c4650fa9c5aa48709e4da3884839dd14c6bd845bb7afa5622
diff --git a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
index 74bc26f09265..f7cce357b776 100644
--- a/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
+++ b/dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rounded or exact English expression of durations"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e50aa3f3c61a..218c3f403304 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index c62948a4359c..2134573e6bb5 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,4 +1,4 @@
 AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
-EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 701 BLAKE2B 14c0fab883e7deeb819361eb6d4394fd1f74b07b61db7904a4a46613d461fc2f7da7412c7ee3b9d1f14ec48244ad348ec8d94de3df3472128bdabaa9fcd9632d SHA512 08565079de6fd9a35d6cef9a3c71787fea18d38069cdc461358d5c3b557888e2ad83b98a8af70ce943e353c999cb6896f93317c701b2b57facf97008f0018eb2
+EBUILD PEAR-Crypt_CHAP-1.5.0-r3.ebuild 706 BLAKE2B a0dd7781882db0bf2dd4145fc6e25aac226bdda1d8d5de0c5d07655f9807abc16f0d28485d44b24f2d57e8a3b2c29690b54b7a207d40b7bf6ba010e98b5c8f3c SHA512 b4f0403b054f004b59affaeb333472d7ec1235e0805de678dd28bf90dbeccf563fe750e427853c87efa6a7f3cf96e43f5932ca548de8cd87854319d56836140d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
index b85782cf6a84..316e144e79a8 100644
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
diff --git a/dev-php/PEAR-File_SMBPasswd/Manifest b/dev-php/PEAR-File_SMBPasswd/Manifest
index e29026dd0631..0e782566b406 100644
--- a/dev-php/PEAR-File_SMBPasswd/Manifest
+++ b/dev-php/PEAR-File_SMBPasswd/Manifest
@@ -1,3 +1,3 @@
 DIST File_SMBPasswd-1.0.3.tgz 5251 BLAKE2B e102bee8628dfe521ad3a4b212694a306c2bcedd869e1a4203fc1280f73cf6b42a95ce0940f36e583db1d1b18260f0eb9e73cd86be2f2cb51fbf9c47a0334b8d SHA512 49c8293ec4de0b20a9a9d80cc1175693cf9846979eeb2e77b08b48da57d214f02ebcd8ed51738222640c94eccadd5bbf0d5c8a3904c9aefb42308632ffb07a0b
-EBUILD PEAR-File_SMBPasswd-1.0.3-r1.ebuild 451 BLAKE2B 6edcf7da8fbbabad9b5d0e939f3d7d4368854506870e65a96b853596e57d1bfcf3266d21d4d98455a5406e7a496ed593de1a5cae3c142d2cfc7c79e683ed760b SHA512 a60e9a750943159673965e2b7c2dbf744ef8530fe6bba9c96159e33946f8ce40ca224f46772067f985c7a020194649430764be3aae0c9095f59d1b545ee15fdd
+EBUILD PEAR-File_SMBPasswd-1.0.3-r1.ebuild 456 BLAKE2B 84a318c303aa210ce0917d460c3f642bb6ff9a6b50555c91cff750007e002ce6c0d283a3a1a827757b1badcd0da3164374220d172f18c4be0f2d0aa9e0cd2b11 SHA512 b35d0e9685c9552bdb286f153303e2c02fdd3bb8f31e785cd2c3f8e0e512925df317e36a73bb94253d37852479687cf39545b18b7b8e5bac69a58bac916fee84
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
index 0a284fedeb2f..71ede40c90f9 100644
--- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit php-pear-r2
 DESCRIPTION="Class for managing SAMBA style password files"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 RDEPEND=">=dev-lang/php-5.3:*
 	>=dev-php/PEAR-Crypt_CHAP-1.0.0"
diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index ef15cd23766c..bfd3a82b2922 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,6 +1,3 @@
 DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265
-DIST amqp-1.9.4.tgz 102604 BLAKE2B 34bed57e2aa3044ac02949ef0d700af71114fc4dd0007ac7a90fadfe267063d8defd6f0e1fe076aa3680187035b1596c283f3cdab8b27f8d3e59f6abf7246147 SHA512 53f8893c2fdb6f41467c9af4a5e48810d39201150a94dd9d32f542d53387ef5e6d8c614ebe2d82b3ab9febd39aa8759a86975d0dc45092a2772f08cd86d7f739
 EBUILD pecl-amqp-1.10.2.ebuild 557 BLAKE2B c32568d1c6a914a39b7e5840289057d6d8a2056350859a57549b109382afa8663145e60e5e06cc8672d9b5e47ec9b6a2b59276ca21e8fd8e74eec4a4c21dba2b SHA512 62a21d29c718ca3a092cfc888e24866a2c7c6edf19d49e49d6668239d28eb873babf0313e90a8692d8c54707e38ba8b546b0716fc582b263445eb07dccb1ed7e
-EBUILD pecl-amqp-1.9.4-r1.ebuild 557 BLAKE2B 69ca6ddcc1b11c1be8c308234d893a008e47d275c9a4257590b7652f4a92e470a712182dc6d2ad46600940eef99bf09de14fb1424f5fcdde5a414ecfc8008d92 SHA512 33ac64b9fa5c7226301c325951cbd81ae7b0104116ad12dd0637b62f74ffc59b5d8109570b3d979016106c32896077cffe369e8538e2f190091473a33b0698b2
-EBUILD pecl-amqp-1.9.4.ebuild 564 BLAKE2B 7092a15b6704faa24486692fe7417d6ffc86f6db4a24433751a4a2b8a69036889f099163f8bc28d3e1e8b937790ad04c3dbccd13cfef1ad38492b4922dba9b12 SHA512 013c096a1b851b3d4bf8f8f5c0eacc041698ebb4b4081f1035dff6ac801053fc2c4d2c95eb51fd21ee2d6ab5428685bb2e57ef5dd73556bbc5f0c32369a18744
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
deleted file mode 100644
index f60903763b86..000000000000
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-# Tests require running rabbitmq-server on localhost which requires epmd
-# which only accepts /var/run/epmd.pid as pidfile.
-RESTRICT="test"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-DEPEND="${RDEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.4.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.4.ebuild
deleted file mode 100644
index fe3eeba38337..000000000000
--- a/dev-php/pecl-amqp/pecl-amqp-1.9.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-# Tests require running rabbitmq-server on localhost which requires epmd
-# which only accepts /var/run/epmd.pid as pidfile.
-RESTRICT="test"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
-DEPEND="${RDEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index e6d310ee2931..0c917aaf18b5 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,7 +1,3 @@
-DIST apcu-5.1.12.tgz 105890 BLAKE2B 110a56ed1da8e33bd39c9d694007acdca2deb42219ae5d31b57296ff3729bab3fdbc508965b2cd0fccc425b2c2fea9249933cd7f45586beeee7cd3bd38ef2473 SHA512 f53b7840d5aecfc899e3e878f0bb9a5dc4a83628543963c20c25ce2b2a2adf14dd40d39a6a2014c139962453e0e9e5038fca7b1d0be205c0b9b2aa6e3fefb054
-DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b323e371a4906fdef77f8d3e7d338af14fe3e116a94aa548c7fb79cc0003556ed739e258370095cbec075 SHA512 7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793
 DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9
-EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B f0d62746f48ad4110941d369da65f38858a1834152a33a56ab0b1eea53a5d1b52fbe5bc3effe2defc724729c6865b34e9a765092ecccf4b32ff2b1c76949ad97 SHA512 81f2c1edb96dc7383fb4b91774c1b985754031ce4f4796860825a7e226c345145c84662d80f0d8f834006697d45d5010863590107ab472574c715b3e85b857d6
-EBUILD pecl-apcu-5.1.17-r1.ebuild 1548 BLAKE2B d60a97e831b68873e09e79d3efa1042bdeb1b2a39858fc9e5eb18f6e690188989d950b0a919d26345d3bc8217d8e5e7b78410511248785698215045e2f5a7a96 SHA512 647e12e2a890ab531840bd9c87827e5bcf3bbd1ee82505420b16b69312dc20776ebe0df39b39f51277cb8959652faa33f52f044531494cc151f6ad0c8511192e
 EBUILD pecl-apcu-5.1.18.ebuild 1545 BLAKE2B a10003e1378a8f18df700d56ff24ae436da3d0c5024156ee57b9ba2469c99e0a499ab989e64f68409c7d175cdfca16366dcd6fa764b14297e9fec4e8082ccf2f SHA512 a9591492b4f53e90bc29a3cb6c666096732437d7eccbc0843191992a67e1a2aca4a1969a5dba3598d2e40c4451b0b837062ab81cb30c2f4cf763127e440a1854
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
deleted file mode 100644
index da6a7f85c523..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt TODO )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock-${l} "
-done
-
-IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock-pthreadrw apcu-rwlocks)
-			$(use_enable lock-spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-pkg_postinst() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-		elog
-		elog "If you depend on the apc_* functions,"
-		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-		elog "provides backwards compatibility."
-	fi
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
deleted file mode 100644
index 19f8e009175b..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock-${l} "
-done
-
-IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	php-ext-source-r3_src_prepare
-	# Remove broken tests from php 7.4 due to trivial output differences
-	if use php_targets_php7-4 ; then
-		php_init_slot_env "php7.4"
-		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-apcu
-		$(use_enable mmap apcu-mmap)
-		$(use_enable lock-spinlock apcu-spinlocks)
-	)
-	# Broken upstream autoconf test disables if present at all
-	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
-
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r3_src_install
-
-	insinto /usr/share/php7/apcu
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of pecl-apcu was"
-	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-	elog
-	elog "If you depend on the apc_* functions,"
-	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
-	elog "provides backwards compatibility."
-}
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 8ea6cfd1bb3a..232c78e679b5 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,7 +1,3 @@
-DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
-DIST mailparse-3.0.3.tgz 940370 BLAKE2B 1454750a90e367a2c9ade2d689a0bd3290005db170e6c2f601c23790fd5de701061b8a9cd0dea64eb501e44b3d0a3e40ff75a58ce5bb633837bad682979c097c SHA512 8bc99cb1a3331ee5d40076abe20a15870deb6e28e2b0adb6227a36a01999648a9341168e05f1db96d2458394a13cad643ee1c5dce4d15669165d01c29d95417b
 DIST mailparse-3.0.4.tgz 940428 BLAKE2B e3e33ecfa953766744a6980e0c681bb9b473d4cbf46179c8099f5483e8da46f47bba30d953d1c3629ea6d1719fcdfb0cca8536de3c3159a979cb7b2cde9ff9a2 SHA512 71eaebc1dc8a4698e60e170facaba16a5a9314bcb21c375b2f9a3069d7f1da819bfabc736b244e3f87131149d4efd9363120e77d8a078a0ede15113123d13ce3
-EBUILD pecl-mailparse-3.0.2-r1.ebuild 1215 BLAKE2B e11ab31a74778d1228285c6b472e461650f0b81fc524e6e7977bf8b9c863cf98b7e04d86a94a52182511cafbcf06263b02fa16f44ca21b94b0eb81fabfbbdccd SHA512 fb3956912162485dfd720d83200d5789ef11f0bb9bba527da658e8fb555083c32c83b7879897f2471e98c784089671be7cafc625ea2f5d979821aa445ed15429
-EBUILD pecl-mailparse-3.0.3-r1.ebuild 664 BLAKE2B 92833ec97a65087e72665d434c7693cd36c903d49dd9a1c5852c9f78a7540bc75902cd8ab64549968317be94357c237b5e9dd85d224b9a4ab1ca8cd400cfb383 SHA512 3373e0dd191259f087e8fbd3d1bf2d323a73500dd69c1bf0ffb5ca91d60cb7f38c54e520439b4d623eed9efbb33ccec5d766e5f27eac2cdb457db02e5208648e
 EBUILD pecl-mailparse-3.0.4.ebuild 660 BLAKE2B 66ce0d63743294160c0373cea35497d689b6eb17f8a83e4fe106ea053fc67ebce72a65fada5161796da3085bd2398b9424398c386363b3a88095190639ba90f2 SHA512 c6823e9b33de01c7c04f2cf80bdf368c4cc560d33d4e4944aad24b40c003efc97a01ef8976408a1022445d3ed1f3f3639bcda51f700d60c071bb4255408c67a4
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
deleted file mode 100644
index 7d86d5ec5871..000000000000
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-DOCS=( README )
-
-USE_PHP="php7-0 php7-1 php5-6 php7-2"
-
-inherit php-ext-pecl-r3
-
-# Only build for 7.x
-USE_PHP="php7-0 php7-1 php7-2"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-PHPUSEDEPEND="
-	php_targets_php7-0? ( dev-lang/php:7.0[unicode] )
-	php_targets_php7-1? ( dev-lang/php:7.1[unicode] )
-	php_targets_php7-2? ( dev-lang/php:7.2[unicode] )
-"
-DEPEND="${PHPUSEDEPEND}
-	dev-util/re2c"
-RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		# Missing test source files in archive.  Fixed upstream in next release.
-		rm tests/011.phpt tests/bug001.phpt || die
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild
deleted file mode 100644
index ba94254281ab..000000000000
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-PHP_EXT_NEEDED_USE="unicode"
-DOCS=( README.md )
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-src_prepare() {
-	# Missing test source files in archive.  Fixed upstream in next release.
-	rm tests/011.phpt tests/bug001.phpt || die
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index c33dd67e89e8..d1967f629b92 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -3,5 +3,5 @@ DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e2
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
 EBUILD pecl-mcrypt-1.0.1.ebuild 643 BLAKE2B bf6681c494f092acbcd868ed66a0b50ca0fa72713463b96b8c392380ee12edbaac8e17d3cf3171e7b0ba47b11a064f9b1e55005f95b647d0e8f3b2dc6cf992e3 SHA512 b6bb1f170a9bcca8cb9d076090c209610435422ce8b186f07c1502db3cbbdbec6daf8f77095de2d5191d2139b839e173b588434fe2e34c2ad2c87233351603ee
 EBUILD pecl-mcrypt-1.0.2.ebuild 673 BLAKE2B a5e32bd4510bf76b05d1103c65fd8636e4d37f1cd3de6147dd1f1c0c494318ce4f7f81f8bdd46431adbd6b7ccb09041a523992275568fc9da6ca14bc9ef3984e SHA512 926055b28940c84eb9f959bf5c62113e80bb24e3e5f1bedea0235de6cb82f0fe881c09ca2bf8ff7d1c8b1e1a758a9c5e5fe6bf4362095041bb83e953c0adcb30
-EBUILD pecl-mcrypt-1.0.3.ebuild 715 BLAKE2B a11f3d8660ed15d917bcd7dca17132dc224d7108619dfe737db7e310a6dc7d5aab85f18c587004e3fe051eea356726c73c8c204cbdcdcbd2d280ddfa5e6d0e71 SHA512 cd42bff34aa01a40a40cf61998e8ea8c9b25b122bcc133fd214129cdb932a0eaaec709b09c97a363e0109a1d42c0d4834d48ba60a11ff5c7f1154d7474f96c65
+EBUILD pecl-mcrypt-1.0.3.ebuild 720 BLAKE2B 456f72365cef8f93219ae55f55439ffa2dcbcbee7044c19ac99c3ee765c7656c456eb36c841f38b847602e9c3ab5dd73b68a5f75ca7e79cd2dfb0cdedb0e6a2e SHA512 bb8046db6ec85b6742c71b352211e9ac7343356011de803220fc72e8027b0f11f39a4a7f94635f6089af11db8deb63cc05905065069ca3419af2bf5864234987
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
index fffb03d449aa..540f56f2fa1a 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-libs/libmcrypt"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/APScheduler/APScheduler-3.5.3.ebuild b/dev-python/APScheduler/APScheduler-3.6.3.ebuild
similarity index 95%
rename from dev-python/APScheduler/APScheduler-3.5.3.ebuild
rename to dev-python/APScheduler/APScheduler-3.6.3.ebuild
index 0f91a4ff2f2d..e00b6354bb4f 100644
--- a/dev-python/APScheduler/APScheduler-3.5.3.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -23,6 +23,7 @@ RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
 	)"
 
 # Tests that are known to fail (some may be triggered by network-sandbox).
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 7bee644e33eb..feee2613a071 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,3 +1,3 @@
-DIST APScheduler-3.5.3.tar.gz 95527 BLAKE2B 3d1bb49a497781d017e2fbd47176186f6449650500c57a141a114f6c610081b9d85553793f9c9f00422d3a299c26c292ab667cfe3866c381bcbf39161133b615 SHA512 dd3e98d0f474511851bdc109a1c65f7f97d221f95d086603d12b3f280285460234724369f05816e1754d58d94adadbec0deb8a0fa63fcd6531914d4a1f4fb3fc
-EBUILD APScheduler-3.5.3.ebuild 1792 BLAKE2B a80a65e8ef6d37d7fe5bf8dd408b5664219272157ec09315903cc241b276c2ef3f514b19d2ce78beee153eb959c29a83d584aeb86463e7477a7926128888069c SHA512 0355ce47492988bd14a89cc081600d87844d6f5f5dc875cd021d5dc855fa0a263aa3a13b1f3421926e001b687a3b85e1a777c45396137cc4641bc104865c0972
+DIST APScheduler-3.6.3.tar.gz 96309 BLAKE2B 6dcd49ec3ebe4f815a7fd2594c438dfe99d9de720a4319a3c7c202deba1235740e478357dd78ef74ec3610652b23a58f23c1188fcddb3b2e48b160895f3ed06a SHA512 4c348a4f37a7973633554a69635f334b3c293c8942fe853b309b4b65335f5d4d553d7d42fd4661b0e6a36f5e97446d296a2c8971bdb51dad3bc8ee6b6d3b20ba
+EBUILD APScheduler-3.6.3.ebuild 1838 BLAKE2B 033af0f8568160181b282208c440ba459fe41f2006decbc5a5c62151db70ec2993d6f3552cce3fa6b4e9d4871c71fb2f6006ecdb0dbb2ec507e4814603d88e04 SHA512 b40c6fc407aec78c74fc7c2fb7273d56ab83ade6d3f3f9b3fc78115d4b6efd0117180a5a20e5dc5dcff2c18fde74f3dc1973db4c83db733d06bea6f60fbcf874
 MISC metadata.xml 353 BLAKE2B e0c141ff0ac5a9f98c3b55871de97976f15324b722420a8def45a053b2fdd0b992c44bd6d1c4824c479700871951423ff13f921043a5dd8770ae73a279deac9b SHA512 48d42b0d3fd5ab07ecbd8554cef11d06bf5d7616e777d6e76103699f305f9aee7bd8618294d5548a62815a621bd4fe6ac4d32c008b79ac7f7334d6a29a261008
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 36e1a50a99b6..aa3ccf953d85 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 63f070a3b4be..3993a1a6aca7 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,5 @@
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
 EBUILD authres-0.800.ebuild 586 BLAKE2B 59c53928f8d774278ee5fdac8fd50b9502520d1b7dd7591bc0ec76860b81084984de9ebbdfd1b23387addd46b87b9f3426e16118dfd1084c2ce090f323478fff SHA512 e343e23a9db914d2226e25fdbe562475379c754c74b51c29e483969bb9c157d9d726026e9deefd31a24c76ee884e7f65b975350cafad6fcf63d12c1b1029187d
-EBUILD authres-1.2.0.ebuild 561 BLAKE2B 395bb6024e682f81e3c7a7081d098966d7398d31e5d86c0136fb3fdca825c69f7c9be217479f2fe146c1bdbac40b3050939cd8343bda96b37353b3fe2e5fc224 SHA512 d0ccc5206933e0dc5b30f84ec5078a195dcd3b30b22ff2ca74a327b7715f27215b8ee3d47651dba398918acd92e28e92ddddc38e6e7562a78fcffe2e7357cb37
+EBUILD authres-1.2.0.ebuild 559 BLAKE2B 86cad530c928f339c51efa9306d535f338831ad8eb72ab19e58628a5c241a693590b6608f18d9927d1a7795ad05f661d03fbf826342e24e4b866419d2e3f573c SHA512 2ef4f47c583b72735cb840a5920196131a8ccf82a5a5959a385c1de1b9c8928396f5a1976091944a738b51241c988a88e22cb98c4f0a2884070a7ed9e165150f
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
index 73bbc14a3218..ebb3dc4e9691 100644
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ b/dev-python/authres/authres-1.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/authentication-results-python
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
new file mode 100644
index 000000000000..6250b102dfb4
--- /dev/null
+++ b/dev-python/bareos/Manifest
@@ -0,0 +1,3 @@
+DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
+EBUILD bareos-19.2.7.ebuild 535 BLAKE2B 36e29280708faabef8209da385989a966e9334ca6bbb5c6401c349f8811cb66c9230feea6c2c33d0237cf4a31401c4ae6ea2a7ba039f1945baebce445a683fe8 SHA512 959a4475cc6ef5e68fa4ff10d6226320e41fea65a09ba07228ea6cf60b7fbe2c2f2ff9180e86ae309db2f1771ec82c151f4177c23b1351ed7a6c2c7ae0cc3cbf
+MISC metadata.xml 328 BLAKE2B 47dda9d82b55f78bbf9b78f8ac463db48ede507dd62dfecd1fec01426e834f2669203956b0a5da31ae133bb0f362ab1263123318babf65abaa6619e1feb209f1 SHA512 c16ba92ff73595406f24c4f2cb18bb2059d7990273d2c91c4f83486f1349ab0ca3d709f27f929956987b60a24ff8426687dafc7f79be0d32df0a176ee2528d93
diff --git a/dev-python/bareos/bareos-19.2.7.ebuild b/dev-python/bareos/bareos-19.2.7.ebuild
new file mode 100644
index 000000000000..c66b7e5732e2
--- /dev/null
+++ b/dev-python/bareos/bareos-19.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="python bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
diff --git a/dev-python/bareos/metadata.xml b/dev-python/bareos/metadata.xml
new file mode 100644
index 000000000000..4a5a7ed6d64f
--- /dev/null
+++ b/dev-python/bareos/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bareos/bareos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index a22191388fbf..68c4df2f9552 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,6 +1,4 @@
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
-DIST binaryornot-0.4.3.tar.gz 372299 BLAKE2B c4ae99b9ccb66da8925d74fad68b8df4713822acc74d852e2f584e5c157eb465bc6418b0e0085533479ba1ee937c3d2716dea66ce3bd517d49a490ab4615f694 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa
 DIST binaryornot-0.4.4.tar.gz 372361 BLAKE2B cb2099313f602915bacd5b463642f16430fcb0ab62dcaae546cb854780996526fb777c0b730b4b89e664ec7f995ddd2d2f632cfbac2dadca45958cfd1dd7a410 SHA512 31dfb79bb5847e12487d94519a357dece4572f7ed064686d53a49c2de5a51d6441be64523c98cca6221ed89be5bf26e54866dd3b79ac8d89fd5019a5b4d75a45
-EBUILD binaryornot-0.4.3.ebuild 686 BLAKE2B 675aa23764e7fa1122aa9524d29ef359615d1263f4e48666ef91638badbe5aaad193d64ab769dfcd8ffc5525e0b0cb66f8193ee0ebdb0bb31118c6de06d3abf8 SHA512 9a6eb7550bba8df5f12233b3833191f7e816713c7374bdc9367b0c1017dd4fe75a49c12546126b97c14031f12f60584c7d82c8343055b9b90d3519c6d4e96392
 EBUILD binaryornot-0.4.4.ebuild 768 BLAKE2B e33987a9b4ff8eaf6f53487290b9c9209a242ba7c184f1242c50b2951e0fdc92a7fd5028d166cc6361c9e45c0c9fa95d5600b22cd44525746fc62350bd6830c3 SHA512 aa2fb3ca6efb3864daa55e7040dd634b53ff071d084657e93cf591aadcb87325c433f9f2b91b0d4072875e0754e78ed34146908e639ac020afe1cda79da38aaf
 MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
diff --git a/dev-python/binaryornot/binaryornot-0.4.3.ebuild b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
deleted file mode 100644
index ab817f0e4b38..000000000000
--- a/dev-python/binaryornot/binaryornot-0.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
-HOMEPAGE="https://github.com/audreyr/binaryornot"
-SRC_URI="https://github.com/audreyr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index f7af474f6b4e..5c45624e3857 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,5 +1,3 @@
-DIST bpython-0.18.tar.gz 213321 BLAKE2B 476c18fbec1d4ef3c5e206e7586b0e982656160474b64ceaecf5b49f560115af0e51d964553aad25bc765f7b431bc4f062581f9f30c0cb2e8da51cdbf2bca5ca SHA512 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab
 DIST bpython-0.19.tar.gz 216564 BLAKE2B a0b469ae28965e7926838b2d520aed0199a39ad5d9d5650e34446601e6e5f023a6c09cbdd85a30b2873dc72b5ef5774c483d5f627accaf29dce7e6f8628cc1df SHA512 7c746848671d5de0b63f0284d2af87c12480fa1ae3e89eb10093ab5dfd42f926171f29bd8bcc19fe173fc58f7eff7276da4639d580836f0d112dc5e85000dc55
-EBUILD bpython-0.18.ebuild 1489 BLAKE2B 8b30f8c8c24461828206e3cd422750add7dc671417a097d631c5db53349d20a9ee58ab80bc53f801f8ff9943c0cbd938d3519be920202980e223c407961a509e SHA512 63685278cddfcd1f11dbc1c2c264dd74b9647ff4ee158bdc8a6db83bbe0633a46d9b7350ecdfefb4b44302551aade4873d057d74944924298569a9b2392c557e
 EBUILD bpython-0.19.ebuild 1487 BLAKE2B c78099c542f93af4606f439e5c12e1969ec7ccee20a197e40b6c2c6c437873700a65cbdb316f8f47b25ee7adbe98cdac0ebbc7f84e30feae9824e36b4e0f3493 SHA512 c605c91478e64c3c1bf9362d9faafda703211bfe71e37a1d0b5ad79a3f8117e3194f08bf6fb4dcfd7c2310b3f63ea8a3bb96a4e46eeb4042767962fab6409351
 MISC metadata.xml 527 BLAKE2B 2691755a7de852d518e3646b965483a12169e56dbfed6fd43961d6833d9ef673f8c0ab146a2677dcef6cfc173f3a9f2200fbb39ed870570b8f28ca641c617e60 SHA512 0710368b088d3c9bcd52c93df885a730a4a3e189781dcd1a10d63fe6dfaabb486e972150ebb693ed1859a4461aa1343bb5ccc80772406abed4e0f0f9776329be
diff --git a/dev-python/bpython/bpython-0.18.ebuild b/dev-python/bpython/bpython-0.18.ebuild
deleted file mode 100644
index c124d8fe9617..000000000000
--- a/dev-python/bpython/bpython-0.18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT="test" #659110
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index e55ef59ef486..316cfff99cfd 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,4 +1,3 @@
-AUX coloredlogs-10.0-skip-cli-test.patch 697 BLAKE2B 677e4ea1a1c8d04390e0a815226b80d06940f713f678ceb716545d98290881dc6324890aef67c5ea12c833d441536a4eeaa989ed8d23a9590e88643874e0da16 SHA512 24233e3d217f074d47165477395a3ca10a47747124f6ce88ad8a190e04fa7136203ac30bb9e82d49eb6adb0d066f7cdeb1c884b39e9c1b7304531f2eb9296e11
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
 AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f03dd2e8e291e7f8e892765cc675d88b338d64f5df12b28b1909d0554eb42bfc70cc564f603d026f05e2ca4fe0952b6021af91 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
diff --git a/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch
deleted file mode 100644
index ba03612f7aeb..000000000000
--- a/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
-index 38f2d97..8d1ae36 100644
---- a/coloredlogs/tests.py
-+++ b/coloredlogs/tests.py
-@@ -503,12 +503,6 @@ class ColoredLogsTestCase(TestCase):
-         for name in 'debug', 'info', 'warning', 'error', 'critical':
-             assert name.upper() in output
- 
--    def test_cli_conversion(self):
--        """Test the command line HTML conversion."""
--        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
--        # Make sure the output is encoded as HTML.
--        assert '<span' in output
--
-     def test_empty_conversion(self):
-         """
-         Test that conversion of empty output produces no HTML.
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index bb34d741f981..8ee4f46431f7 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,7 +1,3 @@
-DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
-DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.5.4.ebuild 799 BLAKE2B 4090dbc41d0c227a18dc297991726bd1beac3c94a2c8339ff7c245539604e4f01e8baf2fe66950a0e1b7c87ffb15d2d684ba0b382d25a1c48c073ca06861c132 SHA512 bb6ff543eeac300fb928ef9cab955536bbf369ed696c99a7e5ea39fb0ba2347fb9da9b1dea65b84f54edf4e820136e7a2ceff409188f13cde3b01645ab121103
-EBUILD commonmark-0.8.1.ebuild 1039 BLAKE2B 923d177fc3c065277a88bb1d52f606bb8d816a9a515a884a2fc304cd39420e1886c8ea1499e35a65d926640cb053bf66ff43fe935255ee6e8aa2a5bf3bbae2f1 SHA512 c784c50a20e7f816e5480fcfb6e8d580a7549607ad13e867f0c722f1799892a67df0471722d4a25541be4962cfecbf7bd4b6fe239dafecf23fa7d67bcd883235
 EBUILD commonmark-0.9.1.ebuild 1025 BLAKE2B 1e098b6b10a1bddd1bb3ed3006fd2b1a571c98b489017bdde46520bfe8eb264cbe761bc05a4b5abc56a2f89baf85283add9d581b19bfb1d6d50e2f5ba10b43d2 SHA512 f6f8a89873db6f10d937cd349235196dbdf52da088b1b55d6b06f6d035f7d7fd56176c611afac16c73004abdda0f61fe020eaf43b8be0bc22d02466cc94ea343
 MISC metadata.xml 763 BLAKE2B 9a79175d4ae0c20b1871d8f89a571e7eca9ac0788c0f3de2ba2ba9bc0fcac4616877c762beec0c75d11737e84ba9759d134f528b3c2292d2823676e8bfbb7aff SHA512 ff467de52a1e48d4c70b9b5e54e5557f4469c5c7ff75ba6e9264642f835b87862085e8ca666977bee3daff00af765248353597a41ddcc62b83c68e0089ca6719
diff --git a/dev-python/commonmark/commonmark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
deleted file mode 100644
index ab0f369be3e8..000000000000
--- a/dev-python/commonmark/commonmark-0.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN=CommonMark
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-# unrestrict for versions >= 0.7.2
-RESTRICT=test
-
-python_test() {
-	LC_ALL='en_US.utf8' LC_CTYPE='en_US.utf8' LANG=en_US.utf8 PYTHONIOENCODING=UTF-8 \
-	esetup.py test
-}
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
deleted file mode 100644
index e2b30049848d..000000000000
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONIOENCODING='utf8' \
-	esetup.py test
-}
-
-src_prepare() {
-	default
-	# Fix file collision with app-text/cmark, see bug #627034
-	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
-		setup.py || die
-}
-
-pkg_postinst() {
-	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
-	ewarn "collision with app-text/cmark (see bug #627034)"
-}
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 287aef723ba8..62f622f2841e 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,4 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
+EBUILD cvxopt-1.2.5-r1.ebuild 5534 BLAKE2B c2a6da2d4ed13e71233cc759d27e33306577c0c52e6b439e02d790529ad22a95b5f06e685891c7c36306dd014809868d068151d6f957d5766b7c6a889889f07e SHA512 c83625f8a004cec9068815363b1e47b2ee93a5cd1d4cbb65b1737c143a65d2061ffe50bd7c86a71394bda45f807763a645e76bc2389f772e4b8c55f7e0809238
 EBUILD cvxopt-1.2.5.ebuild 2963 BLAKE2B 449a65f303b77cb5c92e0819b49bfec7c828bcf46601a280dde0ec708c783fead5a05ee597a2579ef01660b41d51d75ab7bf34b0186e01a37042dcb98274c1eb SHA512 05433f0bffe2e55a9fb547f5a176886a10f4e8797dc292d1ad84bebf85153772df80c236f131fa3b38324760e5742c135d2e5ada4ddefcf5a53000bb4c93468d
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..c4670120832c
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python package for convex optimization"
+HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +dsdp examples fftw +glpk gsl test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	virtual/blas
+	virtual/lapack
+	sci-libs/amd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/suitesparseconfig:0=
+	sci-libs/umfpack:0=
+	dsdp? ( sci-libs/dsdp:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( >=sci-mathematics/glpk-4.49:0= )
+	gsl? ( sci-libs/gsl:0= )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
+
+# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
+# setup.py are passed in as colon-delimited strings. So, for example,
+# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
+# "blas;cblas" for BLAS_LIB.
+#
+# The following function takes a flag type ("l", "L", or "I") as its
+# first argument and a list of packages as its remaining arguments. It
+# outputs a list of libraries, library paths, or include paths,
+# respectively, for the given packages, retrieved using pkg-config and
+# deduplicated, in the appropriate format.
+#
+cvxopt_output() {
+	local FLAGNAME="${1}"
+	shift
+	local PACKAGES="${@}"
+
+	local PKGCONFIG_MODE
+	case "${FLAGNAME}" in
+	l) PKGCONFIG_MODE="--libs-only-l";;
+	L) PKGCONFIG_MODE="--libs-only-L";;
+	I) PKGCONFIG_MODE="--cflags-only-I";;
+	*) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
+	esac
+
+	local CVXOPT_OUTPUT=""
+	local PKGCONFIG_ITEM
+	for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
+	do
+	# First strip off the leading "-l", "-L", or "-I", and replace
+	# it with a semicolon...
+	PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
+
+	# Now check to see if this element is already present in the
+	# list, and skip it if it is. This eliminates multiple entries
+	# from winding up in the list when multiple package arguments are
+	# passed to this function.
+	if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
+	then
+		# It was already the last entry in the list, so skip it.
+		continue
+	elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
+	then
+		# It was an earlier entry in the list. These two cases are
+		# separate to ensure that we can e.g. find ";m" at the end
+		# of the list, but that we don't find ";metis" in the process.
+		continue
+	fi
+
+	# It isn't in the list yet, so append it.
+	CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
+	done
+
+	# Strip the leading ";" from ";foo;bar" before output.
+	echo "${CVXOPT_OUTPUT#;}"
+}
+
+python_prepare_all() {
+	# Mandatory dependencies.
+	export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
+	export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
+	export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
+	export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
+
+	# Most of these CVXOPT_* variables can be blank or have "empty"
+	# entries and the resulting command-line with e.g. "-L -L/some/path"
+	# won't hurt anything. The INC_DIR variables, however, cause
+	# problems, because at least gcc doesn't like a bare "-I". We
+	# pre-populate these variable with something safe so that setup.py
+	# doesn't look in the wrong place if pkg-config doesn't return any
+	# extra -I directories. This is
+	#
+	#  https://github.com/cvxopt/cvxopt/issues/167
+	#
+	CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
+	local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
+	if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
+		CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
+	fi
+	export CVXOPT_SUITESPARSE_INC_DIR
+
+	# optional dependencies
+	if use dsdp; then
+		# no pkg-config file at the moment
+		export CVXOPT_BUILD_DSDP=1
+		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
+	fi
+
+	if use fftw; then
+		export CVXOPT_BUILD_FFTW=1
+		export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
+		CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
+		FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
+		if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
+			CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
+		fi
+		export CVXOPT_FFTW_INC_DIR
+	fi
+
+	if use glpk; then
+		# no pkg-config file at the moment
+		export CVXOPT_BUILD_GLPK=1
+		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
+	fi
+
+	if use gsl; then
+		export CVXOPT_BUILD_GSL=1
+		export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
+		CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
+		GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
+		if [[ -n "${GSL_LOCAL_INCS}" ]]; then
+			CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
+		fi
+		export CVXOPT_GSL_INC_DIR
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 5cedef169398..fa935cda2ee7 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,5 +1,7 @@
+DIST deprecated-1.2.10.gh.tar.gz 2967353 BLAKE2B 941fa81dd27940be4fde1219a9fe127777354aa2054b15178cade4a859b01f8dff426e0da8161bac580ff6446b44767f3207b474bb5f555826239db039085497 SHA512 4bd53b759d04ab15c74a4c147b2c69c73aed6e40555acf0e84cf0c5b7ffe248da234bd1311c5629f9357d50bc08e55e81363340dcfdabe88933525bcc7859a70
 DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
 DIST deprecated-1.2.9.gh.tar.gz 5332765 BLAKE2B 0b88c15a0186d3adcfe3076a477e1bce3565caf39feb8e25c28865d85a168ed4cecda33fd68158571ebaed429e61b2de290f0c7e832dc87baa9cd4d439dcb093 SHA512 04a248d78021c45a1254f80966e6e4e6817ff3f8312d36fa9874c300fc106b7bed3600702a6953044f88cfa08f8ea8d6447c160554d8c1e1568051d3ce4a175b
+EBUILD deprecated-1.2.10.ebuild 550 BLAKE2B 2c34765cc8ca09a11fb7a0b84061bf4f6a71f836f264db9eabc4587a573b13398dd0bac87e8c3afbe66bd24eaed9e3e75bb138416ad2eb5fb952fbd2e5857ad5 SHA512 3f4ab2cbd18fc099437aec2fb90acd6bba5e654f2db1162eeec30b09c6a75d2b6af902d393bd684dc441f6c2086fb02af3e8f7fcbe41c818237a65530977e697
 EBUILD deprecated-1.2.7.ebuild 548 BLAKE2B 662dd028bd1b654d0fe7c889c742f032ca724bf52b5065351cd730bedc7f9c0ecb0f0c9152717fac6eedc8113c87ea30cd787e7adf5b850f9d332dda675a4081 SHA512 5b9f69ac4bab6d2cc439ffd8480db90e1d826802717dda966e2f95d3c05ae98bc3afcdf0f31644ef05d8f563831b735690d56afea88dfdc1fa43c35c47ad6fb3
-EBUILD deprecated-1.2.9.ebuild 550 BLAKE2B 2c34765cc8ca09a11fb7a0b84061bf4f6a71f836f264db9eabc4587a573b13398dd0bac87e8c3afbe66bd24eaed9e3e75bb138416ad2eb5fb952fbd2e5857ad5 SHA512 3f4ab2cbd18fc099437aec2fb90acd6bba5e654f2db1162eeec30b09c6a75d2b6af902d393bd684dc441f6c2086fb02af3e8f7fcbe41c818237a65530977e697
+EBUILD deprecated-1.2.9.ebuild 548 BLAKE2B 662dd028bd1b654d0fe7c889c742f032ca724bf52b5065351cd730bedc7f9c0ecb0f0c9152717fac6eedc8113c87ea30cd787e7adf5b850f9d332dda675a4081 SHA512 5b9f69ac4bab6d2cc439ffd8480db90e1d826802717dda966e2f95d3c05ae98bc3afcdf0f31644ef05d8f563831b735690d56afea88dfdc1fa43c35c47ad6fb3
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
new file mode 100644
index 000000000000..a5088d2c205c
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/deprecated/deprecated-1.2.9.ebuild b/dev-python/deprecated/deprecated-1.2.9.ebuild
index a5088d2c205c..a6bed5059a0d 100644
--- a/dev-python/deprecated/deprecated-1.2.9.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 1595162cafc9..2822a4159bee 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,3 @@
-AUX dill-0.2.5-avoid-installation-binaries.patch 784 BLAKE2B 74f3c8ac45a1ab97dbbcff9965c7acc0357bd8253cdaf317ccfe54294c35ef08cf328a3be0586b123365811b56546a2190eda4d76702efe7f8e5289333de093a SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4
-AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be8ccc3fd81f85e4f72dc2a6b64c3003ba3a21f86d41dd16ffda86c89e2e2f2714a96d6b92ebd19d05a40676e01efcf656fefcdae42 SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
 EBUILD dill-0.3.1.1.ebuild 570 BLAKE2B 940939b066fb2fe3564284ef0c53f1706d129f634f438f6cfb2e45ad4908cdd89ccc026658f17481ca3a2b3578f934cf1f6aa508426dee89096dd216d37b281e SHA512 186dc5b569a0a82be47bbbaaeb06317693bdae4e41cde88e47ae7ea1ba83011c72eb7d2c713c45a7c1f012c5df2be6cb4f738a2cfdb3656a11c416b955f90f41
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch b/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch
deleted file mode 100644
index 16525c10b343..000000000000
--- a/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dfa34a34f09d0f868cc404d5c1ccf071f47fe63f Mon Sep 17 00:00:00 2001
-From: Josue Ortega <josueortega@debian.org.gt>
-Date: Sun, 1 Nov 2015 13:07:04 -0600
-Subject: Patch to avoid the installation of upstream binaries under the wrong
- directories
-
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8f91183..1ee6dcf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -283,10 +283,10 @@ if has_setuptools:
- """ % (ctypes_version)
- 
- # add the scripts, and close 'setup' call
--setup_code += """    
--      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
--"""
--
-+#setup_code += """    
-+#      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
-+#"""
-+setup_code += ")"
- # exec the 'setup' code
- exec(setup_code)
- 
diff --git a/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch b/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch
deleted file mode 100644
index dfa5f0dd653d..000000000000
--- a/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9b32a0be077d5295a42fec7cb17810fa3e8aca45 Mon Sep 17 00:00:00 2001
-From: Josue Ortega <josueortega@debian.org.gt>
-Date: Sun, 1 Nov 2015 13:11:04 -0600
-Subject: Removes install_requires in order to avoid automatic package
-
----
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1ee6dcf..dd90af5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -277,10 +277,10 @@ if has_setuptools:
-       install_requires = ['pyreadline%s'],
- """ % (pyreadline_version)
-     # verrrry unlikely that this is still relevant
--    elif hex(sys.hexversion) < '0x20500f0':
--        setup_code += """
--      install_requires = ['ctypes%s'],
--""" % (ctypes_version)
-+#    elif hex(sys.hexversion) < '0x20500f0':
-+#        setup_code += """
-+#      install_requires = ['ctypes%s'],
-+#""" % (ctypes_version)
- 
- # add the scripts, and close 'setup' call
- #setup_code += """    
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 4d83f943f37e..43d3147f2233 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,6 +4,6 @@ DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e4
 DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
 DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
 EBUILD django-2.2.11.ebuild 2304 BLAKE2B 9c7961c57036af4e8e3878275033b0afb905b0a1e32ca07a8980b1745259a3c05cb239c642cf1d44a1074160dccf578f109db375c5a397fd203ee0aa73bf054c SHA512 1ec3cdeaf83d7d05c6f68e5216993fdd43be0dda13db401f248a4d81a0c93d5ff6dbf074d113c6be32bc830495e18bfb0022c9be3b6a1f5c333c2c6304c8fb95
-EBUILD django-2.2.12.ebuild 2306 BLAKE2B b5feda5cdd15d122ed491ec8c05cfddeefe34b067767db49680981764769a8a7111bffd2335a468d96defc54ecb23f2fbdf5659ff312159ff286cee356850216 SHA512 239ea1b07b7569517ef7f1596a8c4c2fbc29a6f68b0d742d18fadddc0367f487c098970d6281f65204d3f455df4a302ec162032f560502fc77eb205cbbf6c06d
-EBUILD django-3.0.6.ebuild 2323 BLAKE2B 80ed534686f5a7fb5fc8a5988d83b5710d646375bbd2856b232df89add621c41002d18e55cb686a005785942977817a1deeac7449beb7b0e9aff6dad5c8772bb SHA512 2c5a85a70290604d426676bf87e76cd5e92fbf11605a8474f78c867f85ed4de3894ee0458044446d88db9edebfae7f64ee6c016deebe9585699d188cd3913b34
+EBUILD django-2.2.12.ebuild 2319 BLAKE2B bbb771c0f705b919c27691bac19ec789cae02e247d5e6ad38d008fbdaeab3cbb04880838967b70ff75b28e3cd40c6f4a3fc8d89e6833f70883846d9393277761 SHA512 bf4087b350b4b5341102e9f3adcc0af00c1f21464d3d744a7c0fbd51b13c88c3720f61fde56a8f55819f981c623ba0a0fa70eb5a910105b6b7f864d88762b199
+EBUILD django-3.0.6.ebuild 2336 BLAKE2B 621e1b6a47778e8705ffa6789b592f5c762fcfde169b36573e0b58fdf43de28e3183aa4639f48a9e15fca3af528147ff19a02699074eb2fa099b14099fefa36b SHA512 1769b63fef5b7d44a99e2703a544373e6a751ab84ba24869af983230110197aa99b0a0c51271bfa5769313db0da3d2f9e1dc116ebb914cfd21afd7dcd31a7eda
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
index 7a3345a89f49..2166d02e126f 100644
--- a/dev-python/django/django-2.2.12.ebuild
+++ b/dev-python/django/django-2.2.12.ebuild
@@ -47,7 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
 )
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs --no-autodoc
 
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
diff --git a/dev-python/django/django-3.0.6.ebuild b/dev-python/django/django-3.0.6.ebuild
index 58a0c8ae382f..45e856fec808 100644
--- a/dev-python/django/django-3.0.6.ebuild
+++ b/dev-python/django/django-3.0.6.ebuild
@@ -49,7 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
 )
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs --no-autodoc
 
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index f2cd57ab856b..fb75ec06ae48 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,4 +1,3 @@
-AUX flask-login-0.3.2-fix-tests-python2.patch 1115 BLAKE2B 138cab48cbf144a3d4d4704ae293db79e9d41b30326bb2ec28c1c00e75ceec42a2b0eb46bf61ac369bd863406b9fa4a3d7bdb81421e1288ef19d03871e7f5d02 SHA512 2796244a27b504feba773d29cf394ed04b8d7812d8989aca9a5dcd58207c3b192545531c23883f9d6828320adfb09f31388e92af72da5d5a2d2e6df05b89282c
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
 EBUILD flask-login-0.4.1-r1.ebuild 1353 BLAKE2B 7ee3084c7c915978ffcd6bc27a01311897e24b6f6329f5bef75fd4bcef02d2d9af372b7810b2f4236de48986669e6a1c567f4fcef9a68fea2de9de2e7814abd5 SHA512 9401cd990e66ebe0d48cba107fc6a74c0eecd7a3fe97ec109f7c6a7d5859007ae765e2145377be8e66f5d5e4529cb9af3ec7f1790056177f6892d9ad40578b0b
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch b/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch
deleted file mode 100644
index 33811abdc7ac..000000000000
--- a/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/test_login.py b/test_login.py
-index 3f110e0..0c060f5 100644
---- a/test_login.py
-+++ b/test_login.py
-@@ -39,6 +39,7 @@ from flask.ext.login import (LoginManager, UserMixin, AnonymousUserMixin,
- if str is not bytes:
-     unicode = str
- 
-+werkzeug_version = tuple(int(i) for i in werkzeug_version.split('.'))
- 
- @contextmanager
- def listen_to(signal):
-@@ -1073,14 +1074,14 @@ class LoginTestCase(unittest.TestCase):
-     #
-     # Misc
-     #
--    @unittest.skipIf(werkzeug_version.startswith("0.9"),
-+    @unittest.skipIf(werkzeug_version >= (0, 9),
-                      "wait for upstream implementing RFC 5987")
-     def test_chinese_user_agent(self):
-         with self.app.test_client() as c:
-             result = c.get('/', headers=[('User-Agent', u'中文')])
-             self.assertEqual(u'Welcome!', result.data.decode('utf-8'))
- 
--    @unittest.skipIf(werkzeug_version.startswith("0.9"),
-+    @unittest.skipIf(werkzeug_version >= (0, 9),
-                      "wait for upstream implementing RFC 5987")
-     def test_russian_cp1251_user_agent(self):
-         with self.app.test_client() as c:
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 6825490d4de8..5a944e9cb5dd 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,5 +1,3 @@
-AUX 2.3.2-mapping.patch 647 BLAKE2B 4b6243f35ce87b21825aae761512ea2cbbbf11639bd60a53e91609f79eabcb598e07c8286c8312230e0f5e58d02cb2341c786d5f3513fc25d32374f01e5a89dc SHA512 6aed2dee97363ee6fc63aa2626931991e92d25b6cbf6efec702cb8878806a57ed0472eaa53c2557e7521be12921a544b90fa5619b46d44de001e97f97a1a1a8d
-AUX mapping.patch 756 BLAKE2B 4ba6e864233fb2b924f9e54ef1fafaea8b295adabff014b4e3a1d432dcc91d0280e692409ee8bf9650b19dfcf7e26f52ff0c992f98d63280e883cea5aea6b8a6 SHA512 050dd1e5378f0ad361c3524563693e9501c1826dc8f5359c4138ceae74e1ed9ddac88398dc744f400b8e941e018c9afdd5cab9a59df80f95389df1ff1c091b2e
 DIST Flask-SQLAlchemy-2.4.1.tar.gz 128863 BLAKE2B 5ce87601a5dbeb8505144c0970eecd0bf553ad3feccd74e7de567a4fe0702575c6f7935d4812410ced17b7b98e6b8e6fcb67a589681cd82464fa4cf0dc09ba74 SHA512 a55e6fe563583e240bb594c157424fba1a8462f953fa0bb14701954bcb52d1e7bf71eec38f4037c1752ceab90e798642274de58e0f950d83e234f4c702e0b6ee
 EBUILD flask-sqlalchemy-2.4.1-r1.ebuild 689 BLAKE2B 1588de4266000a79441068c8fd55fb424514e37d788e6262864a302d36bba19bc8908a97ed8930a2cab95c650e3d32b790d1d19b77f8ec7f5d96a8d5c52b26e8 SHA512 c1ea8cd09584c5044c2fbb322b5c8a0087614eb5a690164d5ac30afeafa23036957c9dd8cffdf0c5eb55201226d09759a5fd85c04a483c125c616a6df741a041
 MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
diff --git a/dev-python/flask-sqlalchemy/files/2.3.2-mapping.patch b/dev-python/flask-sqlalchemy/files/2.3.2-mapping.patch
deleted file mode 100644
index c736d15a3d12..000000000000
--- a/dev-python/flask-sqlalchemy/files/2.3.2-mapping.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -225,11 +225,11 @@
- 
- 
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {
--    'python': ('https://docs.python.org/3/', None),
--    'flask': ('http://flask.pocoo.org/docs/', None),
--    'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None)
--}
-+# intersphinx_mapping = {
-+#     'python': ('https://docs.python.org/3/', None),
-+#     'flask': ('http://flask.pocoo.org/docs/', None),
-+#     'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None)
-+# }
- pygments_style = 'flask_theme_support.FlaskyStyle'
- 
- # fall back if theme is not there
diff --git a/dev-python/flask-sqlalchemy/files/mapping.patch b/dev-python/flask-sqlalchemy/files/mapping.patch
deleted file mode 100644
index af6572489a4f..000000000000
--- a/dev-python/flask-sqlalchemy/files/mapping.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur Flask-SQLAlchemy-1.0.orig/docs/conf.py Flask-SQLAlchemy-1.0/docs/conf.py
---- a/docs/conf.py	2013-01-27 08:57:36.000000000 +0800
-+++ b/docs/conf.py	2014-04-03 18:08:34.772268079 +0800
-@@ -224,9 +224,9 @@
- 
- 
- # Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://docs.python.org/': None,
--                       'http://flask.pocoo.org/docs/': None,
--                       'http://www.sqlalchemy.org/docs/': None}
-+#intersphinx_mapping = {'http://docs.python.org/': None,
-+#                       'http://flask.pocoo.org/docs/': None,
-+#                       'http://www.sqlalchemy.org/docs/': None}
- pygments_style = 'flask_theme_support.FlaskyStyle'
- 
- # fall back if theme is not there
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 2ed272c04901..d17daab621bf 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,7 +1,3 @@
-AUX genshi-0.7-fix_tests_failure_with_python27.patch 1093 BLAKE2B dc42ccdef1fff73c61687f13fef4c724a4ddff9e436d4d5a2613c31ce8cfe6cf26ddcd2ad04c20050d0a1e6a0f2e4ea9bb5eb54188e989ea6dccfb3909f58a0f SHA512 adf85e1c13c691b1dbbaeea4725a9b5a8ff8d7c6d485196e3537b6e3f6beca6eeb43a7fe452cdfc4612c8be39e9495606377f17854d0778eabd95db13d40d629
-AUX genshi-0.7-issue566.patch 2230 BLAKE2B b981199487dba054af22221958b8b9489a87d40e905b6f5d79713e9f8892d5a0161601ac708d33cf536c27221dc9fe28b992fa2ace16193f94509316e5ad05ae SHA512 a1d9223326ef84566c2f5a4be82012295e1918eceb21fdfaa0f74f28bb21e95646a8188331abebb0e3b1b5cb12ba50d2917eba1d74ea6254581fe3acdddf1b80
-AUX genshi-0.7-issue582.patch 12766 BLAKE2B e92c3777b5ddfdf3cbe91455c541639b0377534b8a8f40b8ea852a582276366fb687890738af0aa9d3a7cec8cd87549d2594fe94207ca6f4704826df34d40895 SHA512 100f2e76d4e9fdad8dbe9c1f70111be597dbdfd5d3efe9d6c4908fa789bc7300311346929106606185834870a8999abe2165ccac3efa94560543c7c5100f9d24
-AUX genshi-0.7-issue602.patch 4504 BLAKE2B a65d56df060e32083d9836b65c96f9f45f90d6ad27bbcc465e1bf9782b0c619a0b2747c0a7691a52390362dc9034ff90f4fedf01a1e8dc51c6d2ae2c8b3d2413 SHA512 59a47ac114065aa398b4795880a02ee98d9605b1a52b53221c4c0efde28b43473d773b9f84ce7c1b954160b5103f53566d739fe39842e6dc6efb6edc61172999
 DIST Genshi-0.7.3.tar.gz 271238 BLAKE2B 20addd3243980574e6e2024a7c275c157392987c5265aaa71527e78b92bd25ec476de21d08f6b442de420a925654a064a0071bbd8cf056c0eb18cd8fb085af8c SHA512 b153a9755f9791f349dea35e3ab3099af66b1be5b83bdea9d356b456ddd4e1ff88f7a85e822a2c06aea936c2f843bdc8ddc91c74de2a72111896d8db9a195b87
 EBUILD genshi-0.7.3-r1.ebuild 790 BLAKE2B 33c4b4e028a67d06e3f6e74cf308467df1864a15b63672474da2501329e4567db9962677b101872c7142ea129b63e4d35b06b879434906505ecca760e2861bdf SHA512 e44b1f962c6749247042f5916111e1dec436deeeff77be2d15f38de731ab5626fcc62733d97d0d694d2124622d491e8d2d53ec584803526899441963d825b4e6
 EBUILD genshi-0.7.3.ebuild 846 BLAKE2B 3c56c5ff32a3ea4946c1464f3869237b2271bd036ee7cfb1c8eb27fe111bbeb096d6c81849e2b60f1a187789643f000be2e809126cb7d716025712b9afe1e46a SHA512 eaec154394fef0c99d6fad57350aaccd66ffb7eeeaec73806f0f6c4f3ae777b98be13c4930f1449692f7a4ee220f3f4b7ceab96a3524b61760342b4ddc69aab7
diff --git a/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch b/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch
deleted file mode 100644
index 4f3467d64815..000000000000
--- a/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7f3552a9373fadd2d37ff592769ba6c65755eea5 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:13:47 -0700
-Subject: Skip test which still fails in Python 2.7.6.
-
-Author: Barry Warsaw <barry@debian.org>, Arnaud Fontaine <arnau@debian.org>
-Bug: http://genshi.edgewall.org/ticket/500
-
-Patch-Name: fix_tests_failure_with_python27.patch
----
- genshi/filters/tests/test_html.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py
-index 0c6cfe1..a8cfa04 100644
---- a/genshi/filters/tests/test_html.py
-+++ b/genshi/filters/tests/test_html.py
-@@ -410,6 +410,7 @@ class HTMLSanitizerTestCase(unittest.TestCase):
-         html = HTML(u'&junk;')
-         self.assertEquals('&amp;junk;', (html | HTMLSanitizer()).render())
- 
-+    @unittest.skip('http://genshi.edgewall.org/ticket/500#comment:3')
-     def test_sanitize_remove_script_elem(self):
-         html = HTML(u'<script>alert("Foo")</script>')
-         self.assertEquals('', (html | HTMLSanitizer()).render())
diff --git a/dev-python/genshi/files/genshi-0.7-issue566.patch b/dev-python/genshi/files/genshi-0.7-issue566.patch
deleted file mode 100644
index 70fc8ea85e64..000000000000
--- a/dev-python/genshi/files/genshi-0.7-issue566.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fafbc4296902b2259c23d2ce55996b0127726b4f Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:13:49 -0700
-Subject: Fix an IndexError preventing Genshi for uploading attachments in
-
- Trac for users with non-English language settings.
-Origin: http://genshi.edgewall.org/changeset/1243?format=diff&new=1243
-Bug: http://genshi.edgewall.org/ticket/566
-
-Patch-Name: issue566.patch
----
- genshi/filters/i18n.py       |  8 +++++++-
- genshi/filters/tests/i18n.py | 12 ++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
-index dfb52b8..8f2d25c 100644
---- a/genshi/filters/i18n.py
-+++ b/genshi/filters/i18n.py
-@@ -1048,7 +1048,13 @@ class MessageBuffer(object):
- 
-         while parts:
-             order, string = parts.pop(0)
--            events = self.events[order].pop(0)
-+            events = self.events[order]
-+            if events:
-+                events = events.pop(0)
-+            else:
-+                # create a dummy empty text event so any remaining
-+                # part of the translation can be processed.
-+                events = [(TEXT, "", (None, -1, -1))]
-             parts_counter[order].pop()
- 
-             for event in events:
-diff --git a/genshi/filters/tests/i18n.py b/genshi/filters/tests/i18n.py
-index 212d5f6..b36a30b 100644
---- a/genshi/filters/tests/i18n.py
-+++ b/genshi/filters/tests/i18n.py
-@@ -928,6 +928,18 @@ class MsgDirectiveTestCase(unittest.TestCase):
-           """</p></html>""",
-           tmpl.generate(first="FIRST", second="SECOND").render())
- 
-+    def test_translate_i18n_msg_ticket_404_regression(self):
-+        tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
-+            xmlns:i18n="http://genshi.edgewall.org/i18n">
-+          <h1 i18n:msg="name">text <a>$name</a></h1>
-+        </html>""")
-+        gettext = lambda s: u'head [1:%(name)s] tail'
-+        translator = Translator(gettext)
-+        translator.setup(tmpl)
-+        self.assertEqual("""<html>
-+          <h1>head <a>NAME</a> tail</h1>
-+        </html>""", tmpl.generate(name='NAME').render())
-+
- 
- class ChooseDirectiveTestCase(unittest.TestCase):
- 
diff --git a/dev-python/genshi/files/genshi-0.7-issue582.patch b/dev-python/genshi/files/genshi-0.7-issue582.patch
deleted file mode 100644
index fbcab626d6c4..000000000000
--- a/dev-python/genshi/files/genshi-0.7-issue582.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From 554fa3428bea3039decfd9064b860c753b2637a1 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:13:48 -0700
-Subject: Make genshi 0.7 compatible with Python 3.4.
-
-Origin: http://genshi.edgewall.org/changeset/1252?format=diff&new=1252
-Bug: http://genshi.edgewall.org/ticket/582
-Forwarded: not-needed
-
-Patch-Name: issue582.patch
----
- doc/upgrade.txt                   |  8 ++---
- genshi/compat.py                  | 10 +++++-
- genshi/filters/tests/test_html.py | 14 ++++++---
- genshi/template/astutil.py        | 66 ++++++++++++++++++++++++++++-----------
- genshi/template/eval.py           | 37 +++++++++++++---------
- genshi/template/tests/eval.py     | 23 ++++++++++++++
- run_benchmarks.sh                 | 31 ++++++++++++++++++
- setup.py                          |  6 +++-
- 8 files changed, 151 insertions(+), 44 deletions(-)
- create mode 100644 run_benchmarks.sh
-
-diff --git a/doc/upgrade.txt b/doc/upgrade.txt
-index b240eda..ad4c080 100644
---- a/doc/upgrade.txt
-+++ b/doc/upgrade.txt
-@@ -7,11 +7,11 @@ Upgrading Genshi
-    :depth: 2
- .. sectnum::
- 
--------------------------------------------------------
--Upgrading from Genshi 0.6.x to the development version
--------------------------------------------------------
-+-------------------------------------------
-+Upgrading from Genshi 0.6.x to Genshi 0.7.x
-+-------------------------------------------
- 
--The Genshi development version now supports both Python 2 and Python 3.
-+Genshi 0.7.x now supports both Python 2 and Python 3.
- 
- The most noticable API change in the Genshi development version is that the
- default encoding in numerous places is now None (i.e. unicode) instead
-diff --git a/genshi/compat.py b/genshi/compat.py
-index 9787325..6574e39 100644
---- a/genshi/compat.py
-+++ b/genshi/compat.py
-@@ -35,6 +35,15 @@ else:
-                 'Python 2 compatibility function. Not usable in Python 3.')
- 
- 
-+# We need to test if an object is an instance of a string type in places
-+
-+if IS_PYTHON2:
-+    def isstring(obj):
-+        return isinstance(obj, basestring)
-+else:
-+    def isstring(obj):
-+        return isinstance(obj, str)
-+
- # We need to differentiate between StringIO and BytesIO in places
- 
- if IS_PYTHON2:
-@@ -112,4 +121,3 @@ except NameError:
-             if not x:
-                 return False
-         return True
--
-diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py
-index a8cfa04..7120988 100644
---- a/genshi/filters/tests/test_html.py
-+++ b/genshi/filters/tests/test_html.py
-@@ -368,12 +368,16 @@ def StyleSanitizer():
- 
- class HTMLSanitizerTestCase(unittest.TestCase):
- 
--    def assert_parse_error_or_equal(self, expected, exploit):
-+    def assert_parse_error_or_equal(self, expected, exploit,
-+                                    allow_strip=False):
-         try:
-             html = HTML(exploit)
-         except ParseError:
-             return
--        self.assertEquals(expected, (html | HTMLSanitizer()).render())
-+        sanitized_html = (html | HTMLSanitizer()).render()
-+        if not sanitized_html and allow_strip:
-+            return
-+        self.assertEquals(expected, sanitized_html)
- 
-     def test_sanitize_unchanged(self):
-         html = HTML(u'<a href="#">fo<br />o</a>')
-@@ -417,10 +421,12 @@ class HTMLSanitizerTestCase(unittest.TestCase):
-         html = HTML(u'<SCRIPT SRC="http://example.com/"></SCRIPT>')
-         self.assertEquals('', (html | HTMLSanitizer()).render())
-         src = u'<SCR\0IPT>alert("foo")</SCR\0IPT>'
--        self.assert_parse_error_or_equal('&lt;SCR\x00IPT&gt;alert("foo")', src)
-+        self.assert_parse_error_or_equal('&lt;SCR\x00IPT&gt;alert("foo")', src,
-+                                         allow_strip=True)
-         src = u'<SCRIPT&XYZ SRC="http://example.com/"></SCRIPT>'
-         self.assert_parse_error_or_equal('&lt;SCRIPT&amp;XYZ; '
--                                         'SRC="http://example.com/"&gt;', src)
-+                                         'SRC="http://example.com/"&gt;', src,
-+                                         allow_strip=True)
- 
-     def test_sanitize_remove_onclick_attr(self):
-         html = HTML(u'<div onclick=\'alert("foo")\' />')
-diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py
-index b24f728..e561846 100644
---- a/genshi/template/astutil.py
-+++ b/genshi/template/astutil.py
-@@ -21,7 +21,7 @@ else:
-     def parse(source, mode):
-         return compile(source, '', mode, _ast.PyCF_ONLY_AST)
- 
--from genshi.compat import IS_PYTHON2
-+from genshi.compat import IS_PYTHON2, isstring
- 
- __docformat__ = 'restructuredtext en'
- 
-@@ -103,32 +103,48 @@ class ASTCodeGenerator(object):
-         self._new_line()
-         return self.visit(node.body)
- 
-+    # Python < 3.4
-     # arguments = (expr* args, identifier? vararg,
-     #              identifier? kwarg, expr* defaults)
-+    #
-+    # Python >= 3.4
-+    # arguments = (arg* args, arg? vararg, arg* kwonlyargs, expr* kw_defaults,
-+    #              arg? kwarg, expr* defaults)
-     def visit_arguments(self, node):
--        first = True
--        no_default_count = len(node.args) - len(node.defaults)
--        for i, arg in enumerate(node.args):
--            if not first:
--                self._write(', ')
-+        def write_possible_comma():
-+            if _first[0]:
-+                _first[0] = False
-             else:
--                first = False
--            self.visit(arg)
--            if i >= no_default_count:
--                self._write('=')
--                self.visit(node.defaults[i - no_default_count])
--        if getattr(node, 'vararg', None):
--            if not first:
-                 self._write(', ')
-+        _first = [True]
-+
-+        def write_args(args, defaults):
-+            no_default_count = len(args) - len(defaults)
-+            for i, arg in enumerate(args):
-+                write_possible_comma()
-+                self.visit(arg)
-+                default_idx = i - no_default_count
-+                if default_idx >= 0 and defaults[default_idx] is not None:
-+                    self._write('=')
-+                    self.visit(defaults[i - no_default_count])
-+
-+        write_args(node.args, node.defaults)
-+        if getattr(node, 'vararg', None):
-+            write_possible_comma()
-+            self._write('*')
-+            if isstring(node.vararg):
-+                self._write(node.vararg)
-             else:
--                first = False
--            self._write('*' + node.vararg)
-+                self.visit(node.vararg)
-+        if getattr(node, 'kwonlyargs', None):
-+            write_args(node.kwonlyargs, node.kw_defaults)
-         if getattr(node, 'kwarg', None):
--            if not first:
--                self._write(', ')
-+            write_possible_comma()
-+            self._write('**')
-+            if isstring(node.kwarg):
-+                self._write(node.kwarg)
-             else:
--                first = False
--            self._write('**' + node.kwarg)
-+                self.visit(node.kwarg)
- 
-     if not IS_PYTHON2:
-         # In Python 3 arguments get a special node
-@@ -732,6 +748,17 @@ class ASTCodeGenerator(object):
-     def visit_Name(self, node):
-         self._write(node.id)
- 
-+    # NameConstant(singleton value)
-+    def visit_NameConstant(self, node):
-+        if node.value is None:
-+            self._write('None')
-+        elif node.value is True:
-+            self._write('True')
-+        elif node.value is False:
-+            self._write('False')
-+        else:
-+            raise Exception("Unknown NameConstant %r" % (node.value,))
-+
-     # List(expr* elts, expr_context ctx)
-     def visit_List(self, node):
-         self._write('[')
-@@ -837,6 +864,7 @@ class ASTTransformer(object):
-     visit_Attribute = _clone
-     visit_Subscript = _clone
-     visit_Name = _clone
-+    visit_NameConstant = _clone
-     visit_List = _clone
-     visit_Tuple = _clone
- 
-diff --git a/genshi/template/eval.py b/genshi/template/eval.py
-index c00cfcb..81644a7 100644
---- a/genshi/template/eval.py
-+++ b/genshi/template/eval.py
-@@ -24,7 +24,8 @@ from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \
- from genshi.template.base import TemplateRuntimeError
- from genshi.util import flatten
- 
--from genshi.compat import get_code_params, build_code_chunk, IS_PYTHON2
-+from genshi.compat import get_code_params, build_code_chunk, isstring, \
-+                          IS_PYTHON2
- 
- __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup',
-            'Undefined', 'UndefinedError']
-@@ -495,28 +496,34 @@ class TemplateASTTransformer(ASTTransformer):
-     def __init__(self):
-         self.locals = [CONSTANTS]
- 
-+    def _process(self, names, node):
-+        if not IS_PYTHON2 and isinstance(node, _ast.arg):
-+            names.add(node.arg)
-+        elif isstring(node):
-+            names.add(node)
-+        elif isinstance(node, _ast.Name):
-+            names.add(node.id)
-+        elif isinstance(node, _ast.alias):
-+            names.add(node.asname or node.name)
-+        elif isinstance(node, _ast.Tuple):
-+            for elt in node.elts:
-+                self._process(names, elt)
-+
-     def _extract_names(self, node):
-         names = set()
--        def _process(node):
--            if not IS_PYTHON2 and isinstance(node, _ast.arg):
--                names.add(node.arg)
--            if isinstance(node, _ast.Name):
--                names.add(node.id)
--            elif isinstance(node, _ast.alias):
--                names.add(node.asname or node.name)
--            elif isinstance(node, _ast.Tuple):
--                for elt in node.elts:
--                    _process(elt)
-         if hasattr(node, 'args'):
-             for arg in node.args:
--                _process(arg)
-+                self._process(names, arg)
-+            if hasattr(node, 'kwonlyargs'):
-+                for arg in node.kwonlyargs:
-+                    self._process(names, arg)
-             if hasattr(node, 'vararg'):
--                names.add(node.vararg)
-+                self._process(names, node.vararg)
-             if hasattr(node, 'kwarg'):
--                names.add(node.kwarg)
-+                self._process(names, node.kwarg)
-         elif hasattr(node, 'names'):
-             for elt in node.names:
--                _process(elt)
-+                self._process(names, elt)
-         return names
- 
-     def visit_Str(self, node):
-diff --git a/genshi/template/tests/eval.py b/genshi/template/tests/eval.py
-index 7722571..c44a0e3 100644
---- a/genshi/template/tests/eval.py
-+++ b/genshi/template/tests/eval.py
-@@ -590,6 +590,29 @@ x = smash(foo='abc', bar='def')
-         suite.execute(data)
-         self.assertEqual(['bardef', 'fooabc'], sorted(data['x']))
- 
-+    if not IS_PYTHON2:
-+        def test_def_kwonlyarg(self):
-+            suite = Suite("""
-+def kwonly(*args, k):
-+    return k
-+x = kwonly(k="foo")
-+""")
-+            data = {}
-+            suite.execute(data)
-+            self.assertEqual("foo", data['x'])
-+
-+        def test_def_kwonlyarg_with_default(self):
-+            suite = Suite("""
-+def kwonly(*args, k="bar"):
-+    return k
-+x = kwonly(k="foo")
-+y = kwonly()
-+""")
-+            data = {}
-+            suite.execute(data)
-+            self.assertEqual("foo", data['x'])
-+            self.assertEqual("bar", data['y'])
-+
-     def test_def_nested(self):
-         suite = Suite("""
- def doit():
-diff --git a/run_benchmarks.sh b/run_benchmarks.sh
-new file mode 100644
-index 0000000..0c64cc8
---- /dev/null
-+++ b/run_benchmarks.sh
-@@ -0,0 +1,31 @@
-+#!/bin/sh
-+#
-+# 1. Run the tests with `tox` (this will set up all the tox envs).
-+# 2. ./run_benchmarks.sh <env-name> | tee results-<env-name>.out
-+
-+NAME="$1"
-+PYTHON="./.tox/$NAME/bin/python"
-+BENCH_DIR="bench_build/$1"
-+BENCH_BIN_DIR="$BENCH_DIR/bin"
-+mkdir -p "bench_build"
-+
-+rm -rf "$BENCH_DIR"
-+cp -R "examples/bench" "$BENCH_DIR"
-+
-+case "$NAME" in
-+  py32|py33)
-+    2to3 -w --no-diffs "$BENCH_DIR"
-+    ;;
-+esac
-+
-+echo "-- basic --"
-+"$PYTHON" "$BENCH_DIR/basic.py" 
-+echo
-+
-+echo "-- bigtable --"
-+"$PYTHON" "$BENCH_DIR/bigtable.py"
-+echo
-+
-+echo "-- xpath --"
-+"$PYTHON" "$BENCH_DIR/xpath.py"
-+echo
-diff --git a/setup.py b/setup.py
-index 294ba9b..45099b5 100755
---- a/setup.py
-+++ b/setup.py
-@@ -65,9 +65,13 @@ available.""")
- 
- 
- if Feature:
-+    # Optional C extension module for speeding up Genshi:
-+    # Not activated by default on:
-+    # - PyPy (where it harms performance)
-+    # - CPython >= 3.3 (the new Unicode C API is not supported yet)
-     speedups = Feature(
-         "optional C speed-enhancements",
--        standard = not is_pypy,
-+        standard = not is_pypy and sys.version_info < (3, 3),
-         ext_modules = [
-             Extension('genshi._speedups', ['genshi/_speedups.c']),
-         ],
diff --git a/dev-python/genshi/files/genshi-0.7-issue602.patch b/dev-python/genshi/files/genshi-0.7-issue602.patch
deleted file mode 100644
index d7f0b77fa921..000000000000
--- a/dev-python/genshi/files/genshi-0.7-issue602.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 1acbd00b4961164edc8a185458ba4a433bedbceb Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:13:46 -0700
-Subject: Fix Python 3.5 compatibility issues.
-
-Origin: http://genshi.edgewall.org/attachment/ticket/602/t602.diff
-Bug: http://genshi.edgewall.org/ticket/602
-Forwarded: not-needed
-
-Patch-Name: issue602.patch
----
- genshi/filters/i18n.py        |  6 ++++--
- genshi/template/astutil.py    | 14 +++++++++++---
- genshi/template/directives.py | 20 ++++++++++++++------
- genshi/template/eval.py       |  5 +++++
- 4 files changed, 34 insertions(+), 11 deletions(-)
-
-diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
-index b724956..dfb52b8 100644
---- a/genshi/filters/i18n.py
-+++ b/genshi/filters/i18n.py
-@@ -1187,8 +1187,10 @@ def extract_from_code(code, gettext_functions):
-                 elif arg:
-                     strings.append(None)
-             [_add(arg) for arg in node.args]
--            _add(node.starargs)
--            _add(node.kwargs)
-+            if hasattr(node, 'starargs'):
-+                _add(node.starargs)
-+            if hasattr(node, 'kwargs'):
-+                _add(node.kwargs)
-             if len(strings) == 1:
-                 strings = strings[0]
-             else:
-diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py
-index a4c21c8..b24f728 100644
---- a/genshi/template/astutil.py
-+++ b/genshi/template/astutil.py
-@@ -135,6 +135,10 @@ class ASTCodeGenerator(object):
-         def visit_arg(self, node):
-             self._write(node.arg)
- 
-+    def visit_Starred(self, node):
-+        self._write('*')
-+        self.visit(node.value)
-+
-     # FunctionDef(identifier name, arguments args,
-     #                           stmt* body, expr* decorator_list)
-     def visit_FunctionDef(self, node):
-@@ -648,9 +652,13 @@ class ASTCodeGenerator(object):
-             if not first:
-                 self._write(', ')
-             first = False
--            # keyword = (identifier arg, expr value)
--            self._write(keyword.arg)
--            self._write('=')
-+            if not keyword.arg:
-+                # Python 3.5+ star-star args
-+                self._write('**')
-+            else:
-+                # keyword = (identifier arg, expr value)
-+                self._write(keyword.arg)
-+                self._write('=')
-             self.visit(keyword.value)
-         if getattr(node, 'starargs', None):
-             if not first:
-diff --git a/genshi/template/directives.py b/genshi/template/directives.py
-index 7301c2d..1f70ef6 100644
---- a/genshi/template/directives.py
-+++ b/genshi/template/directives.py
-@@ -266,13 +266,21 @@ class DefDirective(Directive):
-         if isinstance(ast, _ast.Call):
-             self.name = ast.func.id
-             for arg in ast.args:
--                # only names
--                self.args.append(arg.id)
-+                if hasattr(_ast, 'Starred') and isinstance(arg, _ast.Starred):
-+                    # Python 3.5+
-+                    self.star_args = arg.value.id
-+                else:
-+                    # only names
-+                    self.args.append(arg.id)
-             for kwd in ast.keywords:
--                self.args.append(kwd.arg)
--                exp = Expression(kwd.value, template.filepath,
--                                 lineno, lookup=template.lookup)
--                self.defaults[kwd.arg] = exp
-+                if kwd.arg is None:
-+                    # Python 3.5+
-+                    self.dstar_args = kwd.value.id
-+                else:
-+                    self.args.append(kwd.arg)
-+                    exp = Expression(kwd.value, template.filepath,
-+                                     lineno, lookup=template.lookup)
-+                    self.defaults[kwd.arg] = exp
-             if getattr(ast, 'starargs', None):
-                 self.star_args = ast.starargs.id
-             if getattr(ast, 'kwargs', None):
-diff --git a/genshi/template/eval.py b/genshi/template/eval.py
-index 89aec49..c00cfcb 100644
---- a/genshi/template/eval.py
-+++ b/genshi/template/eval.py
-@@ -593,6 +593,11 @@ class TemplateASTTransformer(ASTTransformer):
-         finally:
-             self.locals.pop()
- 
-+    # Only used in Python 3.5+
-+    def visit_Starred(self, node):
-+        node.value = self.visit(node.value)
-+        return node
-+
-     def visit_Name(self, node):
-         # If the name refers to a local inside a lambda, list comprehension, or
-         # generator expression, leave it alone
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b0aee9357bc9..479928cdd991 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
-EBUILD google-api-core-1.17.0.ebuild 1180 BLAKE2B b446a52c2a3099e042cf06f00ab91daa01372135b5f5b4643e1bb6384a058b68ebb1d4bfe4fbc31ddc9b8a1ba9160a30db741f461e635a2fa8594d9427ea20c3 SHA512 93e4900239cae7cc01b27be5866556e02efb38b83378c68abee68520d0ecc5019659cb942a53217dc3268184e6ac963d875881e12081247b6b9ce9b05c918b60
+EBUILD google-api-core-1.17.0.ebuild 1187 BLAKE2B 692ac826b772415ff44396c82ef680fe09c0119911439e6dce43c6e924a9271012c8b7623e9da60eefb84cf322764b7c5ae6fba9b78d57fe77999536f894cf72 SHA512 ea5a5c29b13cf0c5ee98fa980ca97bc8cf98aca437443a52e0e504d0017b5b81d17899277e44f4b2ecdef091a91f14b5bd6022c6c8ac2b3f5b4781a59415fff3
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
index ad5c4712034d..fd4f9c357956 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 30b4f12b1066..5c33facb5628 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -4,5 +4,5 @@ DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
 EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
 EBUILD google-api-python-client-1.7.9.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
-EBUILD google-api-python-client-1.8.3.ebuild 1300 BLAKE2B 0dc0376aa30b9d55e1e1a96982a5b6f247871d0e1313a6dc7ab22c736b2c7373a4d4c75d3443845bb28448d9688fd2ef36d02db0b7d03af7904ec390fc952f8b SHA512 1ea08d6d2d47428b59b4debba8bc3abbd37fc97f7f7beb336c555099dd34ad21173969c70093149e4a93f859287fae2ff7b4667a8fe04fd4f54119adb1f4ce28
+EBUILD google-api-python-client-1.8.3-r1.ebuild 1351 BLAKE2B 42d102b51a32b6a33324036cb9b1fc37d26cf3327d065b6fda362e3433a343673526c871ea70b2daf0daeae4447c093ba314747f6433b4ace846a22101121ca3 SHA512 63e9640f6b5015728c192d3f7f4e7c43079ebd58446785f33b6c697390ce71eaf0d54f5184ad14794afa25eff7836249f25df9675b8b9f734d8af4094843542b
 MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.8.3.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
similarity index 94%
rename from dev-python/google-api-python-client/google-api-python-client-1.8.3.ebuild
rename to dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
index 41edd77cf759..4433c997610f 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index bae6771bf004..f5b403945b38 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -2,5 +2,7 @@ AUX google-apitools-0.5.30-abc.patch 2828 BLAKE2B 52f328e0701002fbc95f2749329e03
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
 AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
 DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
+DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
 EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
+EBUILD google-apitools-0.5.31.ebuild 1033 BLAKE2B 318f21685f90478db2d0df945873a847a2ddd2c60a5ba6e585bc3afec45a9781a5f7c09ff60e5390b4c1c90337815e456570980237bf6071c15f42747a1e430a SHA512 ee9b30356982fd08f1e4f098762d4a6749c91f7969608f52e7b5ad498b1e4fa3a6a1d8d539c72f66c1db4db74e80fc6c1159b7a0f448f82efbfca2aefb7f2903
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/google-apitools-0.5.31.ebuild b/dev-python/google-apitools/google-apitools-0.5.31.ebuild
new file mode 100644
index 000000000000..4619cf9bed5a
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.31.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="
+	https://github.com/google/apitools/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}/${P#google-}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	test? (	>=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
+)
+
+distutils_enable_tests nose
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index b9b52e38e9ff..dd4655b8e40c 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
-EBUILD googleapis-common-protos-1.51.0.ebuild 672 BLAKE2B 1f96193dd73c37edba503219621eb9c6b69c19ee701db0762651058e448aa13d9202c273081449e3bea768c08c409c049ade070d5c47c9611a2326f3c9d301e7 SHA512 f24f460e0a52fda185b7ddad699025140e72ffbbfe1fe53157e0c57d518e9f7c53d4392ca8a7729512b1429b45f00675f41569380398c0ba884211559584c152
+EBUILD googleapis-common-protos-1.51.0.ebuild 679 BLAKE2B 100ec96c0672efc21df7e91341571089600525bcab3f3591ea6d4122915d155c5dac9f380b44b633ba325a30c967823c1189e83abbb3b18b527d29a03fba27b1 SHA512 cce800f8a21ef4a6d03f18a10c0892bdc43c1138e3e647ad9aae29042914aad44e39a200b5fae468153029d87e6903deea81fb503ca4b9582c8d3a90113efab4
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
index 32a486e3e624..66c187a0f218 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index b2ff3df9b51e..fe6f7f751bdf 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,5 @@
 AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-EBUILD h5py-2.10.0-r1.ebuild 1566 BLAKE2B becebbb46c7be67d18e904360d141cd747d02c4fda93fa496d24c703b55aa5aba800e7e219fe742e61abfacba4c3fb0ca1c09aabcc3f046d24fbb10c71630500 SHA512 83cac568f0ac9d0e97181a7e3f9b4b117669be8c30821fbbdaddf61d45a8e2518ca1cf1f525c4381da33f1cc4ac3aa97700eba874527b1fc23653178dff5efa9
+EBUILD h5py-2.10.0-r1.ebuild 1565 BLAKE2B dfa4b03741c9790009fd37165a773b1b4405e72fb71aa82a7e541e49832bf47b5a0e1c06c58cfe2faa207ccf803ca6410c753d566b8a4159afa7da3f925f4c1d SHA512 3ab018d1ee47b9d3c2f5a2540d6e4ea8ac3ad8686ed350566497f7872a1f326eebca4f609ef4f3a064d97eddb2ed0e750e0edadbcef8a8369dd12dffd1e1b5ff
 EBUILD h5py-2.10.0.ebuild 1444 BLAKE2B 33f6fe1ec2965ba813db74d215049135b8bed3f02aedf9d3958ed4a1b3e53a738ee4f68c0ba7bc23e982c595d1e4d18b88623e0884c96d70af3f0edb2fb8e4b5 SHA512 0f74c2ce5ea0736339039c751026530cd61d96eb4c45c0d69aa2fd583a0dc9db08068041ed3dfd656811dd5d614396b3f7b73ec4610529016c4a1b29a1da149d
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
index 8f7e6b5429f2..9b7bac61dfcf 100644
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild
+++ b/dev-python/h5py/h5py-2.10.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="examples"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 #RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
 RDEPEND="sci-libs/hdf5:=[hl(+)]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 8f1a3ec6fce7..8daef30f1359 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,6 +1,6 @@
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
-EBUILD httpretty-1.0.2-r1.ebuild 1166 BLAKE2B 9cbdebc2f5c0f61abf873d7186bde0686e52af9d3f46ccbb496f43facf789dea77deead52b8a49a10cbd2c633f825de26ae85beaf82e29f7ff15915728fde7a3 SHA512 fe9be81f993ff7aca25303a8241cd3fe5efa0b1bf0c9157141ec46d5934314b659399bc8699d74b9bcc056761c44e46a8df97c30a761edf734f11460e755b133
+EBUILD httpretty-1.0.2-r1.ebuild 1317 BLAKE2B abe6f461f97e9cdd8defecc2810c5ffacdf266ca7e7ad12582e2b7b1dc99817eb45ee031d3e1f053d151513edafa22cd109f9a1fdfc3aa37358520298310bdc8 SHA512 3f5a9864fcd30594f15423ddde65c3e40fc66ff97a0568595e86f21d5079b39927f48fca5d05ac0933328ace316485e9cd75c07f9c1aa61ea35f725ca949baf2
 EBUILD httpretty-1.0.2.ebuild 1038 BLAKE2B 52b1f2faf18a03fdf9769c138c2de275b8bef2774e668df5b2a0fce36ecc83aec18a6f19146320b05b43420783a239c4267cd322cec83af4409c3a693b20e221 SHA512 7081a41e72ebaa0dfa96795250ab6c814857c8d7d237181ff9c3197ec71be6923ef02614d2d068cbcf122b5ad53278c32f4f2a599c7a274fb708ab01d2e2546c
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
index eb33b6f3b1d3..14224da1434d 100644
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -37,6 +37,9 @@ python_prepare_all() {
 	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
 	# tests requiring network access
 	rm tests/functional/test_passthrough.py || die
+	# requires running redis server
+	# it is skipped correctly but it causes unnecessary dep on redis-py
+	rm tests/functional/bugfixes/test_redis.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 0af8e485d1e0..b5a810159cf1 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,4 +1,3 @@
-AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
 AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 EBUILD imapclient-2.1.0.ebuild 1017 BLAKE2B f34c7b19010fbcda2f02bb86b8d1d9c710b609dbbacd1f9b842deb199479b50f93e3ad6d558cb5e80bac2b779b332efd7972acb3bc3cec149b4db44162fe678c SHA512 f83fbe15bdedde4816e6db021cee90052d615a992f5b94d36088296871c62de4b9132ce461aaafdd94bf7802a2c40e919f5dd369347f608064467a5035659dc4
diff --git a/dev-python/imapclient/files/0.12-tests.patch b/dev-python/imapclient/files/0.12-tests.patch
deleted file mode 100644
index 0bd0d001e6e1..000000000000
--- a/dev-python/imapclient/files/0.12-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur IMAPClient-0.12.orig/imapclient/test/test_imapclient.py IMAPClient-0.12/imapclient/test/test_imapclient.py
---- imapclient/test/test_imapclient.py	2015-01-12 19:36:18.000000000 +0800
-+++ imapclient/test/test_imapclient.py	2015-01-17 08:42:46.669121934 +0800
-@@ -10,7 +10,7 @@
- from datetime import datetime
- from mock import patch, sentinel, Mock
- 
--from imapclient import six
-+import six
- from imapclient.fixed_offset import FixedOffset
- from .testable_imapclient import TestableIMAPClient as IMAPClient
- from .imapclient_test import IMAPClientTest
-diff -ur IMAPClient-0.12.orig/imapclient/test/test_imap_utf7.py IMAPClient-0.12/imapclient/test/test_imap_utf7.py
---- imapclient/test/test_imap_utf7.py	2015-01-12 19:36:18.000000000 +0800
-+++ imapclient/test/test_imap_utf7.py	2015-01-17 08:43:23.893392410 +0800
-@@ -4,7 +4,7 @@
- 
- from __future__ import unicode_literals
- 
--from imapclient.six import text_type, binary_type, int2byte, unichr
-+from six import text_type, binary_type, int2byte, unichr
- from imapclient.imap_utf7 import decode, encode
- from imapclient.test.util import unittest
- 
-diff -ur IMAPClient-0.12.orig/imapclient/test/test_response_lexer.py IMAPClient-0.12/imapclient/test/test_response_lexer.py
---- imapclient/test/test_response_lexer.py	2015-01-12 19:36:18.000000000 +0800
-+++ imapclient/test/test_response_lexer.py	2015-01-17 08:42:14.749747748 +0800
-@@ -5,7 +5,7 @@
- from __future__ import unicode_literals
- 
- from imapclient.response_lexer import TokenSource
--from imapclient.six import next
-+from six import next
- from imapclient.test.util import unittest
- 
- 
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 8b3adb22c4cd..eccf08b8992a 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0.ebuild 661 BLAKE2B 6f9692b92cf263bda883bede77288616fd8691569a85d69d0f30cfe92e2bfdaa6584f2bb159b131b4bf0406002b362ca71ac7f6be30bcb67364ced3331ece77f SHA512 376932d5435ed115e3ddea968daf34b480ed7fd59f1659037898b2d6ff12eb66834a3f3dba9c75e1a4624096b63feab010dc9705848502df9fab6cedc718fe99
+EBUILD ipaddr-2.2.0.ebuild 663 BLAKE2B 81d87d3ed102a165bf5ca25e5311bc2f882851c9b6c77cf4b2c8c75ea80619c6f0f5102471e6d8d4d5c02e6d27f9a74d58b9e0be1672611c15b99136c023ec67 SHA512 3e80c351d310bbbb4f52f548fde2ea57c553e6db99957c5d2206c18236e3cc2937e18e4dbd3e0e7059970c63afb3401ecaf0ed78e9dcca867a7a52492c81c466
 MISC metadata.xml 493 BLAKE2B aebbbdad8a285f35bb8635efe1ebb3740108597d7c5842c64ce56aeea95e918445493fa2dd1acaa9db641c73b1fe36c48e6203dcde42dd8af9f52be7cafec9ab SHA512 23d6c158e1e33c5731eebede2743c612b0220e7f7d769470115a4143a6f69c46d8652c535837632f32494f852c1074112f808b67ca43488a49f09accff840779
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
index 08f765c99c7c..84ed45148909 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 784730535b1f..31480050d122 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
 EBUILD jaraco-itertools-4.4.2.ebuild 1655 BLAKE2B 70cb2db3fc1c9f808ab510019df7456534be797b784bacc44cab4a4e3c258df7c031165ddb30e2fe155a3048a1626e5e5ab6f8332bbc1b361702218d9ddc64e6 SHA512 8673b99b27f52724a005f3e99ed702aebab1d5d2cbc6ee2ed0f7d72103710d76c09160d6a852af8d6ba002d3dc7a27b6c21416c6d7c822ab5f9fb828be4f2f76
-EBUILD jaraco-itertools-5.0.0.ebuild 1860 BLAKE2B d0fc1a4b8e4aca3ec48b535f5e0bbbf46e45a1dd59d1580373824b0d7d1b320e6e8d3679d0f26d14b99529e3101d30c80c59111cd142007461eaa80978fa22e0 SHA512 7364968b0e7761aeafb7d8ad87eaa804f7a1e683b00c785da2cb5d13178192d6ca1ced6c83e52212a78694626b5e4698d68099d15a2fcf8d7089ebed5b693d61
+EBUILD jaraco-itertools-5.0.0.ebuild 1859 BLAKE2B 383d200cff91d382676766ee00554f25c8a86ecb112706ac7080308ec6b822c6f2a6213e21748c8971ce13b7701ca4d34c3cf74df786b31c00c391ac6ad6ba01 SHA512 941af6cabeccea5604e958c67fea6ed7c564efc34a2ab41cddd8b2e4f6c94a1db55bc0aa93ab856eb1ba11c5e0c441e19a382eeac79bd29072d5807521e79cd0
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index ef57f2280ce0..c3b2a1af0455 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index a5a66485d2f7..1fd89f71af5a 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,4 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
 EBUILD paramiko-2.7.1.ebuild 1417 BLAKE2B 2d5b5b788dd203bf8b94fcdcf4834effacea9d4c1a87b5463819c9e6e9928d2a3f2b7b5dd81624d832316e79f7074ab08e29593ac4bddfa6c90e96a71acd7700 SHA512 69a4f4244ba8ed18208f45efacda8f84abde3b46699ecacb96df8d2b08626572c70cc89b1fabfb74bfced85f1a67e2323d20c3cdfe80f6aa753787c25c69e0ba
diff --git a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch b/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
deleted file mode 100644
index 4b15f6a50502..000000000000
--- a/dev-python/paramiko/files/paramiko-2.6.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Skip tests requiring pytest-relaxed since it was removed from the tree due to
-breaking pytest.
-
---- paramiko-2.6.0/tests/test_client.py
-+++ paramiko-2.6.0/tests/test_client.py
-@@ -33,7 +33,7 @@
- import weakref
- from tempfile import mkstemp
- 
--from pytest_relaxed import raises
-+#from pytest_relaxed import raises
- from mock import patch, Mock
- 
- import paramiko
-@@ -684,7 +684,8 @@
- 
-     # TODO: more granular exception pending #387; should be signaling "no auth
-     # methods available" because no key and no password
--    @raises(SSHException)
-+    #@raises(SSHException)
-+    @unittest.skip("skip tests requiring pytest-relaxed")
-     def test_passphrase_kwarg_not_used_for_password_auth(self):
-         # Using the "right" password in the "wrong" field shouldn't work.
-         self._test_connection(passphrase="pygmalion")
-@@ -705,7 +706,8 @@
-             password="television",
-         )
- 
--    @raises(AuthenticationException)  # TODO: more granular
-+    #@raises(AuthenticationException)  # TODO: more granular
-+    @unittest.skip("skip tests requiring pytest-relaxed")
-     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-         self
-     ):
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index cd38350253e4..a42d0ec6bc38 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,4 +1,3 @@
-AUX paste-2.0.3-unbundle-tempita.patch 1260 BLAKE2B eee8a9ede07730cc6af7de910a0298bfac23f6d2b31467101375720782920d878716bf91a031ba651e00a61f3a7201708e94ecd8b78f1bd6a52c50ef2826f8d5 SHA512 f21894596c81d984bd7820876e7dfc614728beba107294fecbab084ae1e023428d4d86bde31e428c2f0aa78647636d19f476129ff319dd2c90052218cf428c98
 DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
 EBUILD paste-3.2.3.ebuild 1746 BLAKE2B 21bc0c5925223b5f3a46166f048b061e7f69dfed80e540f5adf3103bb3cac0cc6b0c767088f7b984a985a46081fb6499de86b3252fdbe162ce60fc8cec6b81c3 SHA512 965981d5831e50d140e2783aa17d1b8be51d6e90d1dc88210f6b1f70f66fb6bb33fb37e71b87fae377e9c999fc5a321b0cb03aea6d6391941e7c722901f7f7f0
 MISC metadata.xml 802 BLAKE2B cb355da6c4b803a1777a5fdffe5c262d65d8580a0ac902a79ff3f631037ec16a8865969e5a9ea663c97960e5e52370a438b700148c9813bcb535c8385f588fb1 SHA512 44f4ded1a14298d020ca255a48d26d63cd2c1915e537c45718f630710caaa00453059bfe0f615bf3217db7d2b81fcbd419fc67e8b56ce6096c5844d53c6ab94c
diff --git a/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch b/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch
deleted file mode 100644
index eef7abb4108e..000000000000
--- a/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- paste/util/looper/__init__.py                     | 4 ++++
- paste/util/{looper.py => looper/_looper.py}       | 0
- paste/util/template/__init__.py                   | 6 ++++++
- paste/util/{template.py => template/_template.py} | 0
- 4 files changed, 10 insertions(+)
-
-diff --git a/paste/util/looper/__init__.py b/paste/util/looper/__init__.py
-new file mode 100644
-index 0000000..77d7e80
---- /dev/null
-+++ b/paste/util/looper/__init__.py
-@@ -0,0 +1,4 @@
-+try:
-+    from tempita._looper import *
-+except ImportError:
-+    from _looper import *
-diff --git a/paste/util/looper.py b/paste/util/looper/_looper.py
-similarity index 100%
-rename from paste/util/looper.py
-rename to paste/util/looper/_looper.py
-diff --git a/paste/util/template/__init__.py b/paste/util/template/__init__.py
-new file mode 100644
-index 0000000..a0a5730
---- /dev/null
-+++ b/paste/util/template/__init__.py
-@@ -0,0 +1,6 @@
-+try:
-+    from tempita import *
-+    from tempita import paste_script_template_renderer
-+except ImportError:
-+    from _template import *
-+    from _template import paste_script_template_renderer
-diff --git a/paste/util/template.py b/paste/util/template/_template.py
-similarity index 100%
-rename from paste/util/template.py
-rename to paste/util/template/_template.py
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 6bb8717e6ad7..e0a516b52da0 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,5 +1,4 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
-AUX pip-19.3.1-disable-system-install.patch 809 BLAKE2B e3a6027922291efe4d1603cb730a9b6aaf653692bc176fd9eea5b804f3d10c419317e9caa97673c02533d4072baf99439af4f76bd38dd5c2ddb98a234ea32c91 SHA512 cf5418444c1a39716b0e528f0630ef931cdd0a4890d16801a575a5072600eb15195d0c0c67e711290e5ed6c7fc40da3f2fd3e5993c638f152240e0ee6f895ac0
 AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b
 AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e6f02c0e623f33e2bbae6b5b16acebc34c9205c53d8221ec98e99167e26eb789d3fbf075406bbdba6dc74c120288fea2d0bcd98beeec SHA512 eb2fb10828aca4a1179f8763c63d861f547e2d92da32c7fd697863e26583eba4f1b0d76a820a82afe3803a6ea22c61b01d3fd98291ec5cff4700855294b19286
 AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104
diff --git a/dev-python/pip/files/pip-19.3.1-disable-system-install.patch b/dev-python/pip/files/pip-19.3.1-disable-system-install.patch
deleted file mode 100644
index 70583957bd74..000000000000
--- a/dev-python/pip/files/pip-19.3.1-disable-system-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-19.1/src/pip/_internal/commands/install.py
-+++ pip-19.1/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
-
-+        if not any((options.use_user_site, options.target_dir, options.root_path, options.prefix_path)):
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index b735cf326ace..7ad20a417722 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,5 +1,4 @@
 AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
-AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 EBUILD pluggy-0.11.0.ebuild 849 BLAKE2B ccf14580737128928dc9bb67d0bee729829e40da6d629ee35605d11664b2df6e55ac933da779c385821342f8ebc76319b2a01371ddf0502346d839400c9aee36 SHA512 3d20936b6a60e9a834448c9714615378dabfa6634538778d0f609a54eae1273041d9ff27cb27579933968561a05b30df1fb41a72028e3f9711dac5d02c5f2694
diff --git a/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch b/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch
deleted file mode 100644
index 578b56ce3467..000000000000
--- a/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/testing/test_helpers.py b/testing/test_helpers.py
-index 846b0a1..89a52b1 100644
---- a/testing/test_helpers.py
-+++ b/testing/test_helpers.py
-@@ -1,3 +1,4 @@
-+import platform
- from pluggy.hooks import varnames
- from pluggy.manager import _formatdef
- 
-@@ -27,6 +28,9 @@ def test_varnames_default():
- 
- 
- def test_varnames_class():
-+    # fails under pypy3
-+    if platform.python_implementation() == 'PyPy':
-+        return
-     class C(object):
-         def __init__(self, x):
-             pass
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index 6076175eda95..f0c4bb892ee7 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,5 +1,5 @@
 DIST pockets-0.5.1.tar.gz 18437 BLAKE2B eb2414b05f7843f8ce253cd137aac087daa4839ca4b16ce9d6f1745535d3687a5bc832abfd6597a6761c12f7251b32a1007e5d34434e0f54ef2c7a5873756f99 SHA512 f0ae52e2260d83ea76acf8996e901a8f1868b578788b9e98233d92850703ef98e3ba18beb4e7adc5883c8d339ea63a8c4b95203ff40c2521b2179fd87cab1391
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
 EBUILD pockets-0.5.1.ebuild 586 BLAKE2B 45d03fb4c8b688f425a44595050fd4398040725a120bdb6b7c97c55a3fac59bb8fbbf5a7cb5c9908896b08752462d50d187feb5c94bcfd96cf0fd531a749fadc SHA512 848d91cdc5339be2a254d0da6b9000e590d59ebe2a816a81986f2282cc0544ca01fb7c5c6dbf9b663b395af8ec3b8212e6371732d29fbf3edd3287b98cf9eb2b
-EBUILD pockets-0.9.1.ebuild 484 BLAKE2B 8aebe3c188c8aeefdab99cba244daa4edb22bd6954de5a3ad6dcc75c32235e2a259c6d2f28bd17e7311a8263a95b98f7836dd1d606afa5f995938c78d750e03e SHA512 a0aad02360976b364d95319a9b751ea60cfc61e7c737169bd32b7fad685621b3067875129814d77953c134d32c4e816863050bf0538c59189d4e105ca30acef0
+EBUILD pockets-0.9.1.ebuild 483 BLAKE2B 9053ce2bbd69a691fb297566438084e838ff23ac490f63803c90c0ca4670275b51a60daacafff817d64fc64ea92b386c0eac12482b09dfefe241838694ed0812 SHA512 567721b7f139168950ff6d5bdc3ab3818a74910dfd0a50f37390c1f53f49a2f447f8d74df31025bc971f0deeae474a4173a31270d19ee96d59308b66141738b2
 MISC metadata.xml 331 BLAKE2B cb17ecc8fb5618d45d09af9211028e4876b6523792f70d20df4104b9dc72f132a592ba961d2571632e34a72f213eff0c06e02d1700c82d4f46ca48ea9d9fc844 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb
diff --git a/dev-python/pockets/pockets-0.9.1.ebuild b/dev-python/pockets/pockets-0.9.1.ebuild
index be09c57277a6..154e2537b023 100644
--- a/dev-python/pockets/pockets-0.9.1.ebuild
+++ b/dev-python/pockets/pockets-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 41a41e84a835..40396e646dd2 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,3 @@
-AUX pyalsa-1.0.29-no-build-symlinks.patch 775 BLAKE2B c8669e67fdb72b169db4a1445c1045d9687246b5f735697d9ba1fefa9ad71dfc2ee898585febf46fc7f028aad81e8b18b6be1f871c515ef6c16c1ffe620691dc SHA512 647783293e2576e8fe3631bad6082000c315ac4b5312e4e212c7fcadd84082e06964fda66bbeda781f33f75596ef561e18b0652e25beb88d0f883c131b3d2d32
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 EBUILD pyalsa-1.1.6-r1.ebuild 635 BLAKE2B 4db5cbd9be0c8284c8630d7a787c13789e0ad2eb67801dbdc48a2956e9c6bdc1171027cecac79feaf5589ced5197623fdbf89f06e647856adc16e0558fdeb661 SHA512 ff301a493810864a723ae32ef25df51a8044d3913361a49f587a75dda942eb5668e40becdc905d3613dd56df35395e7c07de6a6021efc6e5e64ff03f040133cc
diff --git a/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch b/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch
deleted file mode 100644
index 72bf0bcb49c5..000000000000
--- a/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur pyalsa-1.0.29.orig/setup.py pyalsa-1.0.29/setup.py
---- setup.py	2015-02-26 20:36:18.000000000 +0800
-+++ setup.py	2015-03-22 12:53:26.941401236 +0800
-@@ -58,20 +58,3 @@
-     packages=['pyalsa'],
-     scripts=[]
- )
--
--uname = os.uname()
--a = 'build/lib.%s-%s-%s' % (uname[0].lower(), uname[4], sys.version[:3])
--for f in ['alsacard.so', 'alsacontrol.so', 'alsahcontrol.so',
--          'alsamixer.so', 'alsaseq.so']:
--  if not os.path.exists('pyalsa/%s' % f):
--    a = '../build/lib.%s-%s-%s/pyalsa/%s' % \
--                    (uname[0].lower(), uname[4], sys.version[:3], f)
--    print a, f
--    p = 'pyalsa/' + f
--    try:
--      st = os.lstat(p)
--      if stat.S_ISLNK(st.st_mode):
--        os.remove(p)
--    except:
--      pass
--    os.symlink(a, 'pyalsa/%s' % f)
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index b287cddeba44..9872130c9e0b 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,3 +1,3 @@
-DIST pypugjs-5.9.4-tar.gz 42179 BLAKE2B 6ba3ab0b5c4c2828a091c82d5e937ebd1f575f5a9ebd989fbcfa3c17b85471f084d04b641895e8bd4af32ca0c26c430c5d989287824e0bc67f1943fae3bb0caa SHA512 24ebf306a76afab570cb13806d27e12766163bb114a8e4fe20ee5f19eb7311203e8b647eeb2f150efb2f9dfa1db9e56f4218cc3deb15d81f22b12d1b11f83c32
-EBUILD pypugjs-5.9.4.ebuild 516 BLAKE2B f95277eabf5dbaf015a2df9379f730133005a152d890f05703b49af0866616028db374aca89954b3f3b9f5ebde63f90a2b2bc050ae14b69b24b651842aed3e1d SHA512 3d4e8b4cba6486379fe669d01d11ad52907936c2fa27e0b097f02546b8b07dbaea072f635fb2079ff518422d5fccd8bd2eab736a7a294fbb47bfc5fb5ba69cc0
+DIST pypugjs-5.9.4.tar.gz 42179 BLAKE2B 6ba3ab0b5c4c2828a091c82d5e937ebd1f575f5a9ebd989fbcfa3c17b85471f084d04b641895e8bd4af32ca0c26c430c5d989287824e0bc67f1943fae3bb0caa SHA512 24ebf306a76afab570cb13806d27e12766163bb114a8e4fe20ee5f19eb7311203e8b647eeb2f150efb2f9dfa1db9e56f4218cc3deb15d81f22b12d1b11f83c32
+EBUILD pypugjs-5.9.4-r1.ebuild 516 BLAKE2B 5904ce9e2deea2f9466eb6387734e77294b1a03e4854e5440bc5be2ae912de19547a411c64e5f54745e8925964d389fe8ad811eca03e8085badae03d9e08a21f SHA512 bd955a1926b7cd86dbb98f17e1ab5e99fb0b8a7c2ca11d5758cd4fc16979a8902d6bb6c09145d9b03470dba958ed841cb2d1147ae2937ccd1e105320f5ebc5c4
 MISC metadata.xml 730 BLAKE2B 69d4b53c231f47d4526b71c6ed6459834c9e30f54e6b8b6d033ae8cc192d3fd64d99d64c958d29849008b249b8f04f54a9b0503039c79a5893a6d9f0a9209127 SHA512 90ef4ffbbd9f47c60321cc2422e5b6b43377236ba5dcae6584a2c4eba63d0df35131f234a6b98e4df545876d4c0af6bede8a8b406664138a228506378d71b6d4
diff --git a/dev-python/pypugjs/pypugjs-5.9.4.ebuild b/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
similarity index 96%
rename from dev-python/pypugjs/pypugjs-5.9.4.ebuild
rename to dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
index 9b4e376ca260..84216b99cfb4 100644
--- a/dev-python/pypugjs/pypugjs-5.9.4.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
 HOMEPAGE="https://github.com/kakulukia/pypugjs"
-SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}-tar.gz"
+SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 578f080826fa..337248e246b7 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,4 +1,3 @@
-AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
 EBUILD pyserial-3.4.ebuild 878 BLAKE2B 0ee38020a2985d469f5f36df16c0b2a85b7c0ba7a598d06b8e260bae0a2b5bdebf9c633eafcc2bed32950f2df6aa3ec44988bc79da36d984e3b886ccab34ba5f SHA512 971d7ceb3c61c2f2bf0f620d090cd66603318ba1b2624d951c26a60c0e88abfd8fa19d9cc7029e8329560df942309c5c5f13ab624b31ba526fc0d297a1d5df09
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/files/mapping.patch b/dev-python/pyserial/files/mapping.patch
deleted file mode 100644
index dfcb4731bbbd..000000000000
--- a/dev-python/pyserial/files/mapping.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur pyserial-2.7.orig/documentation/conf.py pyserial-2.7/documentation/conf.py
---- a/documentation/conf.py     2013-10-18 00:29:53.000000000 +0800
-+++ b/documentation/conf.py  2014-03-28 12:41:08.848807687 +0800
-@@ -192,9 +192,3 @@
- 
- # If false, no module index is generated.
- #latex_use_modindex = True
--
--# for external links to standard library
--intersphinx_mapping = {
--        #~ 'python': ('http://docs.python.org', None),
--        'py': ('http://docs.python.org', None),
--        }
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index ba0e2fa16350..d7f181a5c764 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,5 +1,5 @@
 DIST pyspf-2.0.12t.tar.gz 67189 BLAKE2B 40ddecf6e9717da9e496c5852866259f28af11c5e9ef581ef1188b07896bce7abc3ba901063bfea2ec9f89d70e17275b0e2619f23f9dc334628ebb0af084b79c SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d
 DIST pyspf-2.0.14.tar.gz 69446 BLAKE2B 95a3bf89ab85aad84dcbbe81ada7f19d23cc689893df1d1317c0e06eb1f6b6d21b1e805d68e7c0c84161d711b9c6067f115d78c8786ce384036f7d0c425269b9 SHA512 ca801a899a80c18cd2c6bb8c125817c29898189805040cce8d29ace7a5aa34b43b9d10545150a1f39abd7bc49cd8da4fe753a04ac9b911e7bb9d77473753eeee
 EBUILD pyspf-2.0.12.ebuild 792 BLAKE2B b7247f6bf0d8fecf265f793f850038ebbed93ee4d723718a3b2988cb2125e1a9a750d0bc1dcaf48caa42dfaca74a4916d79303c6fe6a2e1cd661fd7c6fdf4eda SHA512 c97669e7936880222f752b56788805d10b67ec499972e7d3d5121a6bb9b138438cc08413036e4035fa2d07e425da49d810da9da24199f0ba06c51b0b2e9fcf3c
-EBUILD pyspf-2.0.14.ebuild 824 BLAKE2B ab0950386385a2a4729558ce464c92af13ed7896d24ceeb1f8bcd1380bcbead5f4d7a07a0af0e5744e537c46a1e163d4e65f378aab320dd917d9f2b743eea30e SHA512 4e09f3b831fe8bf3460aed9f879c57a55c147e5b18809cd9c590a06700029bbb8d7b8b04698cd730c17d0776551ae6d92ff3b1fae6f71c0dbcbe99a373f99eaf
+EBUILD pyspf-2.0.14.ebuild 822 BLAKE2B 3dd0ae5ab746f3bae58649b38763a7cfc468fd39c46b40c52d05927f6cc406233370efa30fe2d4eba9baa860cb7c2bfeab5220ab7da53b658a39038d562fb422 SHA512 e019d402f8882251245dddc9d0239ef7bd5f400044136c7427672443758ce65d3b2e4ea77c05644e6f8a2f2fccfabb0d0f444cbc84966dfb0a5a09bbf42fd925
 MISC metadata.xml 318 BLAKE2B 428f1f97b1e20927edbd26d3cb405e242e2bdc4c2cd301b9dd7999570b0ffb5af1c786a6cf596917d6d2694e29cf47c3809d3af97adb078064dc3562fe2690e1 SHA512 561cbdd0b14a8fb091ba9943987d93c8c1323a4b5f8f2b32f094284d683eec5562153a5a8ec77412a0806bac56c5667ec6e9e8d99e77bc2e45a5b7d517c8c483
diff --git a/dev-python/pyspf/pyspf-2.0.14.ebuild b/dev-python/pyspf/pyspf-2.0.14.ebuild
index 0a05ece1b7d0..97a34c45d65f 100644
--- a/dev-python/pyspf/pyspf-2.0.14.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index aa160c3bae42..bd8c2b3ce41a 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,4 @@
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3527 BLAKE2B eb793ad1ec92a944445a405f323aae660031d63db7612856265c1afe339db4b05f40f2d6c94f988d47dd769b7835bdb2d438718a1eb6d192c3213ee7f055fc86 SHA512 e0c48ed24aadd457cddc98f30965bfebb1b9c9b6f8921fb43d065877cb1344ee7f0d0ba157f9090e2190419f04470e7acbd34c388de07e3e8b586ded7012c2a0
-AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch 3504 BLAKE2B b26810c285257c14eec697e7529c3a85c637619dc19979a48b16b0ce45780041e84946748b30b048de84f5b35bb320dd7f79a22a13f42954433ad7ec7f3286a4 SHA512 37ad4c6630b0055a57704b375e6fa869c87a16b0d5d6c79bf77dd5cdfd7aeac56ad696e5a8acc5028b34dec35b932fa76e9fa8b26095cd369508af3386d3f89c
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
 EBUILD python-dateutil-2.8.1-r1.ebuild 1349 BLAKE2B b6b77a5192c12bcb8653f3afa4abdf8e772110ba019d09ca4ee540cf79ea60c0eb6ca9cc6e04937e6b877321d1289430895bd22f0b9ed08fec1b749623a6154d SHA512 cdf0ef0b2a9b9990eedb4fed82c5597b2ab8479891f128dc05983d8f015264f8fa72ca346f3d3ade890de2b690b36df173bcafd0caf75c64c83af2bb6e6175fc
diff --git a/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch b/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch
deleted file mode 100644
index 2e3f4ee914ce..000000000000
--- a/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f48e70ae846c161dfbfe6ddb36e4bcad4427ac8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 3 Apr 2018 22:03:32 +0200
-Subject: [PATCH] zoneinfo: Get timezone data from system tzdata
-
----
- dateutil/test/test_imports.py |  3 +--
- dateutil/zoneinfo/__init__.py | 25 ++++++++++++++-----------
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/dateutil/test/test_imports.py b/dateutil/test/test_imports.py
-index 2a19b62..97d07e4 100644
---- a/dateutil/test/test_imports.py
-+++ b/dateutil/test/test_imports.py
-@@ -158,9 +158,8 @@ class ImportZoneInfoTest(unittest.TestCase):
-     def testZoneinfoStar(self):
-         from dateutil.zoneinfo import gettz
-         from dateutil.zoneinfo import gettz_db_metadata
--        from dateutil.zoneinfo import rebuild
- 
--        zi_all = (gettz, gettz_db_metadata, rebuild)
-+        zi_all = (gettz, gettz_db_metadata)
- 
-         for var in zi_all:
-             self.assertIsNot(var, None)
-diff --git a/dateutil/zoneinfo/__init__.py b/dateutil/zoneinfo/__init__.py
-index 34f11ad..e9870ca 100644
---- a/dateutil/zoneinfo/__init__.py
-+++ b/dateutil/zoneinfo/__init__.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- import warnings
- import json
-+import os
- 
- from tarfile import TarFile
- from pkgutil import get_data
-@@ -10,7 +11,7 @@ from dateutil.tz import tzfile as _tzfile
- 
- __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
- 
--ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
-+ZONEDIRECTORY = "/usr/share/zoneinfo"
- METADATA_FN = 'METADATA'
- 
- 
-@@ -19,12 +20,14 @@ class tzfile(_tzfile):
-         return (gettz, (self._filename,))
- 
- 
--def getzoneinfofile_stream():
--    try:
--        return BytesIO(get_data(__name__, ZONEFILENAME))
--    except IOError as e:  # TODO  switch to FileNotFoundError?
--        warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror))
--        return None
-+def iter_zones(topdir):
-+    for dirpath, dirnames, filenames in os.walk(topdir):
-+        for f in filenames:
-+            if f.endswith('.tab'):
-+                continue
-+            fpath = os.path.join(dirpath, f)
-+            relpath = os.path.relpath(fpath, topdir)
-+            yield (relpath, tzfile(fpath, filename=relpath))
- 
- 
- class ZoneInfoFile(object):
-@@ -48,7 +51,7 @@ class ZoneInfoFile(object):
-                     # no metadata in tar file
-                     self.metadata = None
-         else:
--            self.zones = {}
-+            self.zones = dict(iter_zones(ZONEDIRECTORY))
-             self.metadata = None
- 
-     def get(self, name, default=None):
-@@ -99,7 +102,7 @@ def get_zonefile_instance(new_instance=False):
-         zif = getattr(get_zonefile_instance, '_cached_instance', None)
- 
-     if zif is None:
--        zif = ZoneInfoFile(getzoneinfofile_stream())
-+        zif = ZoneInfoFile()
- 
-         get_zonefile_instance._cached_instance = zif
- 
-@@ -140,7 +143,7 @@ def gettz(name):
-                   DeprecationWarning)
- 
-     if len(_CLASS_ZONE_INSTANCE) == 0:
--        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
-+        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
-     return _CLASS_ZONE_INSTANCE[0].zones.get(name)
- 
- 
-@@ -163,5 +166,5 @@ def gettz_db_metadata():
-                   DeprecationWarning)
- 
-     if len(_CLASS_ZONE_INSTANCE) == 0:
--        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
-+        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
-     return _CLASS_ZONE_INSTANCE[0].metadata
--- 
-2.17.0
-
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 0f6c34a03b38..baeb52a9192f 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,4 +1,3 @@
-AUX genextdoc.py 7029 BLAKE2B 0d4b2c1110838696e1bbe7ef07b30d4bed04955da3451717558ed5a290ed5d1270a0fbea188f21098109f429979995e9548baedc3b9282e33e6703f03390861c SHA512 f03a6628e982da094d40e14d63cc2d233677d78ca1ad0dd0817bc69176d8d4374c2a0caa94a4d0891ba3b7ab14cbbad1b530319984df990176e151d79331b906
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
 EBUILD python-levenshtein-0.12.0.ebuild 638 BLAKE2B addf8094eab80585fe6344147e9d05d5d51ec72f26571ea14bde2cc18e959c2ebcaa324a0e12acad8ca3c5cbb4798d9852800c844160b4935e634f9e465035ea SHA512 cc31b5370111262c61ce6692fcd708d9a62f6a919cbaed0f97021a55d8fc41c06479789b93885e3db5f55455c769961d7b38d80751307024b119ed10e58b2b14
 MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
diff --git a/dev-python/python-levenshtein/files/genextdoc.py b/dev-python/python-levenshtein/files/genextdoc.py
deleted file mode 100644
index 54ce008e88ac..000000000000
--- a/dev-python/python-levenshtein/files/genextdoc.py
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/python
-# Simple Python extension module doc generator.
-# @(#) $Id: genextdoc.py,v 1.4 2003/12/23 22:38:28 yeti Exp $
-# Written by Yeti <yeti@physics.muni.cz>
-# This program is in the public domain.
-import re, sys, types, inspect
-from cgi import escape as q
-
-args = sys.argv
-args.pop(0)
-if not args: sys.exit(0)
-
-selfcontained = False
-if args[0].startswith('-') and 'selfcontained'.startswith(args[0].strip('-')):
-    selfcontained = True
-    args.pop(0)
-if not args: sys.exit(0)
-modname = args.pop(0)
-plain_docs = args
-
-html_head = """\
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head><title>%s %s</title></head>
-<body>
-"""
-
-html_foot = """\
-</body>
-</html>
-"""
-
-def split_para(doc):
-    p = []
-    for x in doc.split('\n\n'):
-        x = x.strip()
-        if x.find('\n>>>') > -1:
-            h, t = x.split('\n>>>', 1)
-            p.append(h)
-            p.append('>>>' + t)
-        else:
-            p.append(x)
-    return p
-
-def get_doc(members):
-    try: doc = members['__doc__']
-    except KeyError: pass
-    if doc: return doc
-    try: doc = 'Python module %s' % members['__name__']
-    except KeyError: pass
-    if doc: return doc
-    else: return 'A Python module'
-
-def format_synopsis(synopsis, link=False, classname=None):
-    lst = synopsis.split('\n')
-    for i, s in zip(range(len(lst)), lst):
-        m = re.match(r'(?P<func>\w+)(?P<args>.*)', s)
-        args = re.sub(r'([a-zA-Z]\w+)', r'<var>\1</var>', m.group('args'))
-        func = m.group('func')
-        if link:
-            if classname:
-                func = '<a href="#%s-%s">%s</a>' % (classname, func, func)
-            else:
-                func = '<a href="#%s">%s</a>' % (func, func)
-        lst[i] = func + args
-    return '<br/>\n'.join(lst)
-
-def format_para(p):
-    if not p: return ''
-    doc = ''
-    if p.startswith('>>>'): doc += '<pre>\n%s\n</pre>\n' % q(p)
-    else:
-        if not re.search('^- ', p, re.M): doc += '<p>%s</p>\n' % q(p)
-        else:
-            p = re.split('(?m)^- ', p)
-            if p[0]: doc += '<p>%s</p>\n' % q(p[0].strip())
-            del p[0]
-            doc += ('<ul>%s</ul>\n'
-                    % '\n'.join(['<li>%s</li>' % q(p.strip()) for p in p]))
-    return doc
-
-def preprocess_routine(name, doc):
-    parts = split_para(doc)
-    if parts: summary = parts.pop(0)
-    else: summary = 'FIXME'
-    if parts and re.match(r'\w+\(.*\)', parts[0]): synopsis = parts.pop(0)
-    else: synopsis = name + '()'
-    return {'synopsis': synopsis, 'summary': summary, 'details': parts}
-
-def analyse(obj):
-    members = obj.__dict__
-    if inspect.isclass(obj):
-        main_doc = preprocess_routine(obj.__name__, get_doc(members))
-        bases = [x.__name__ for x in obj.__bases__]
-    else:
-        main_doc = split_para(get_doc(members))
-        bases = []
-    routines = {}
-    classes = {}
-    data = {}
-    for name, m in members.items():
-        if name.startswith('__'): continue
-        try:
-            mro = list(inspect.getmro(m))
-            if mro[0] != m: continue
-        except AttributeError: pass
-        if inspect.isroutine(m):
-            try: doc = m.__doc__
-            except KeyError: pass
-            if not doc: doc = 'FIXME'
-            routines[name] = preprocess_routine(name, doc)
-            continue
-        if inspect.isclass(m):
-            classes[name] = analyse(m)
-            continue
-        t = type(m)
-        if t == types.IntType or t == types.StringType:
-            data[name] = repr(m)
-        else:
-            data[name] = m.__doc__
-    return {'name': obj.__name__, 'doc': main_doc, 'routines': routines,
-            'classes': classes, 'data': data, 'bases': bases}
-
-def format(tree, level, prefix=''):
-    name = tree['name']
-    if prefix: fullname = '%s-%s' % (prefix, name)
-    else: fullname = name
-    ##### Main doc
-    doc = []
-    if level > 1:
-        doc = ['<h%d id="%s">' % (level, fullname)]
-        try: doc.append(format_synopsis(tree['doc']['synopsis']))
-        except TypeError:
-            doc.append(name)
-        doc.append('</h%d>\n' % level)
-        if tree.has_key('bases'):
-            doc.append('<p>Bases: %s.</p>\n' % ', '.join(tree['bases']))
-    try: lst = [tree['doc']['summary']] + tree['doc']['details']
-    except TypeError: lst = tree['doc']
-    for p in lst: doc.append(format_para(p))
-    ##### Table of contents
-    routines = tree['routines'].keys()
-    classes = tree['classes'].keys()
-    data = tree['data'].keys()
-    if routines:
-        routines.sort()
-        if level == 1: doc.append('<p><b>Functions:</b></p>\n')
-        else: doc.append('<p><b>Methods:</b></p>\n')
-        doc.append('<ul class="ltoc">\n')
-        for r in routines:
-            synopsis = tree['routines'][r]['synopsis']
-            doc.append('<li>%s</li>\n' % format_synopsis(synopsis, True,
-                                                         fullname))
-        doc.append('</ul>\n')
-    if classes:
-        classes.sort()
-        doc.append('<p><b>Classes:</b></p>\n')
-        doc.append('<ul class="ltoc">\n')
-        for r in classes:
-            synopsis = tree['classes'][r]['doc']['synopsis']
-            doc.append('<li>%s</li>\n' % format_synopsis(synopsis, True,
-                                                         fullname))
-        doc.append('</ul>\n')
-    if data:
-        data.sort()
-        doc.append('<p><b>Data:</b></p>\n')
-        doc.append('<ul class="ltoc">\n')
-        for r in data:
-            doc.append('<li>%s = %s</li>\n' % (r, q(tree['data'][r])))
-        doc.append('</ul>\n')
-    ##### Functions
-    if routines:
-        if level == 1: doc.append('<hr/>\n')
-        doc.append('<dl>\n')
-        for r in routines:
-            doc.append('<dt id="%s-%s">' % (fullname, r))
-            rt = tree['routines'][r]
-            doc.append('%s</dt>\n<dd>' % format_synopsis(rt['synopsis']))
-            for p in [rt['summary']] + rt['details']:
-                doc.append(format_para(p))
-            doc.append('</dd>\n')
-        doc.append('</dl>\n')
-    ##### Classes
-    if classes:
-        for r in classes:
-            doc.append('<hr/>\n')
-            doc.append(format(tree['classes'][r], level+1, fullname))
-    return ''.join(doc)
-
-exec 'import %s as __test__' % modname
-doctree = analyse(__test__)
-document = format(doctree, 1)
-print modname + '.html'
-fh = file(modname + '.html', 'w')
-if selfcontained: fh.write(html_head % (modname, 'module API'))
-fh.write(document)
-if selfcontained: fh.write(html_foot)
-fh.close()
-for f in plain_docs:
-    try: fh = file(f, 'r')
-    except: continue
-    document = fh.read()
-    fh.close()
-    print f + '.xhtml'
-    fh = file(f + '.xhtml', 'w')
-    if selfcontained: fh.write(html_head % (modname, f))
-    fh.write('<h1>%s %s</h1>\n\n' % (modname, f))
-    fh.write('<pre class="main">\n')
-    fh.write(document)
-    fh.write('</pre>\n')
-    if selfcontained: fh.write(html_foot)
-    fh.close()
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index a33b92e7e6b0..c0bd58579d05 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,4 +1,3 @@
-AUX defs 273 BLAKE2B 5e1883f4d09a438b14d11ecb943b1f9ac9d9d0cdbc10bab7dfeb7ad19adfa38adc26bd42a0e4d857e1e00bb95d5de8af2538136b173ef70f4b3b25c88641a678 SHA512 4a51870b0b4de46995eeb2e74487e79eb6bd55fd8c0c736176655b22ff7737957cf16b7f86455bf6e9ae724dc773cd90d5d021c296985b93fbb25da01ac4c211
 DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
 EBUILD python-xlib-0.27.ebuild 872 BLAKE2B b0f89b9e907a4c1063d7b050a96eb2add4edaf84715872c4e7e43a9717d4b589d77c7fb825301b847441eeeb7545c96137f562eec91c86b622321159762946ee SHA512 42b5f01ab1c4d6a2cf74c04baa2ed90282202d2398d4e241d107cda6a309a70ca4d6c354b6cdc3d3bf78659a068f020fda4dc386a4262f0b66c0a4d878024738
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/files/defs b/dev-python/python-xlib/files/defs
deleted file mode 100644
index 2da6f932799b..000000000000
--- a/dev-python/python-xlib/files/defs
+++ /dev/null
@@ -1,11 +0,0 @@
-# Definitions for documentation makefiles
-
-SRCDIR = ../src
-
-TOPSRC = $(SRCDIR)/python-xlib.texi
-
-SRCS = $(TOPSRC) \
-     $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
-     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
-     $(SRCDIR)/events.texi $(SRCDIR)/objects.texi
-
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index d58c17f3889b..b7b766264e8c 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1339 BLAKE2B 013879fbb3ea5f152158078ff7d25b7b8abe5274e0a6ff8d7d3dd77c7ce00a26e9e6677e4cf7ab15c04c5107cf480fe074f99b28800b846b503c2d1466226cd9 SHA512 677a25b9fc65633178ebe0324c1f1416a7740e86ab93a6999205a458de286d15138219720e70b55215b8cc125e8de15e685d2e7f9775676a35429dd71d31cedb
-EBUILD python_orocos_kdl-9999.ebuild 1339 BLAKE2B 013879fbb3ea5f152158078ff7d25b7b8abe5274e0a6ff8d7d3dd77c7ce00a26e9e6677e4cf7ab15c04c5107cf480fe074f99b28800b846b503c2d1466226cd9 SHA512 677a25b9fc65633178ebe0324c1f1416a7740e86ab93a6999205a458de286d15138219720e70b55215b8cc125e8de15e685d2e7f9775676a35429dd71d31cedb
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
+EBUILD python_orocos_kdl-9999.ebuild 1349 BLAKE2B f33d35db2be5aedba22adb0341a6e02c46b4f55e7753647723e289dac0599cb9ff0490abd92a0e990b57bda442cf78e0f1e844856bd532c955c57da8b11df220 SHA512 e8cf13f597b1624b8898f40846fda7c75ffc30a14f28bd168495c73ac1b0bcd420be04b80631696612d66e5234552dadbd69bdb44003d103bdc52e3c5ddc2867
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index a25144796229..7b2f41eea0d4 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index a25144796229..7b2f41eea0d4 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 17784952810b..0ea20b2e41c9 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,7 +1,4 @@
-AUX 2016.6.1-zoneinfo.patch 569 BLAKE2B a4cb4ae2bd6953f8f315bb0c444bd083d3431d85128fb9d0ab3c97ad3679114a5f0ce13afcde65070d8bad0fc586b893260b30ccfe793bba6be26f85e9e08b22 SHA512 d1b2bf717c8099eb5cfbe353d50eb034ed321303f6430c0f4183dd84a64780157615b29b7aaf7c04eb8fe69e48c039e479f22f70f713b2aa5e907ae371c8ba01
 AUX 2018.4-zoneinfo.patch 549 BLAKE2B 5654ac8133627afaf9dc17dd9ae8e6a22ef9206efc6ca88495bfdec0078fc77a290ab7a62d6d1aa722ac01b9428bf37382d5f19d9da65593aed43354d05ceeec SHA512 eb365950d2eb62c8d984146228c7d96fca96b2ab4ea90b951a85b3f450550451e6c014da21e403476435e71c5ae989f169d21e07c56fab9713dacec0aee3184f
-AUX pytz-2009h-zoneinfo-noinstall.patch 957 BLAKE2B aec135326ab00e0287fc1c57ca745bc113ab8f0564d7328e82ed00cb024ad8a5008dcac4a7f580967672e996e861bc994fd307de7aee7e55f5e8623fe64844c5 SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446
-AUX pytz-2009j-zoneinfo.patch 651 BLAKE2B 9e0f5d4f037691ee02809ae46887d6f4f5a390e95f670d604a6525b9b68ba4b1743ed34a8c0c05b70f436e2023bc0c9326a6a9fa46ac3ce87eb9438adcdb60b2 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038
 AUX pytz-2018.4-zoneinfo-noinstall.patch 579 BLAKE2B 1d21d01160dbdf6c6848c2c0088cbc6ca326270b106098ce7157b363acf6f4da750a58498be95a8b5bf1ee342b679fdbbf16cf9d542d5f46088062db83f866f7 SHA512 309c2427f5a8ebb77bdf899ad3fb34029c46901cbaf2baf3ab697b83608dd1d3c6e7cf776b1b9b592918b91cbafd148ee3e4c0b4255f38ea3e41c0bca94f4c51
 DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
 DIST pytz-2020.1.tar.gz 311771 BLAKE2B 2d7dd9987fd912dd2a62b5c4ab1667a13f3704ff407796c00fd76b6f3ac4dfcffba9f58740f9456ddfade6c2ef6deacc754f57f5e434b97da36b36fca3024d0f SHA512 4f652ab400bac0bd83ed305be7540094e674029a0cbde7da280adfd911b8c0a44023799b7c61971a5a61a1d6e3992c5b621e5e95bbfe962f310d5f26d4fda3ce
diff --git a/dev-python/pytz/files/2016.6.1-zoneinfo.patch b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
deleted file mode 100644
index d8223da436cf..000000000000
--- a/dev-python/pytz/files/2016.6.1-zoneinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pytz/__init__.py
-+++ b/pytz/__init__.py
-@@ -81,8 +81,7 @@
-     for part in name_parts:
-         if part == os.path.pardir or os.path.sep in part:
-             raise ValueError('Bad path segment: %r' % part)
--    filename = os.path.join(os.path.dirname(__file__),
--                            'zoneinfo', *name_parts)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     if not os.path.exists(filename):
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
deleted file mode 100644
index 2e9709579883..000000000000
--- a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e43745593e4627de8027587cb3b4a465c93fa0b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 19 Dec 2012 19:22:29 +0100
-Subject: [PATCH] Do not install zoneinfo files.
-
----
- setup.py | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index c8152d5..8f13279 100644
---- a/setup.py
-+++ b/setup.py
-@@ -13,15 +13,8 @@ me = 'Stuart Bishop'
- memail = 'stuart@stuartbishop.net'
- packages = ['pytz']
- resources = ['zone.tab', 'locales/pytz.pot']
--for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
--    # remove the 'pytz' part of the path
--    basepath = dirpath.split(os.path.sep, 1)[1]
--    resources.extend([os.path.join(basepath, filename)
--                     for filename in filenames])
- package_data = {'pytz': resources}
- 
--assert len(resources) > 10, 'zoneinfo files not found!'
--
- setup (
-     name='pytz',
-     version=pytz.VERSION,
--- 
-1.8.0.2
-
diff --git a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch b/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
deleted file mode 100644
index ee05d9f5efa4..000000000000
--- a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Use the system zoneinfo from sys-libs/timezone-data.
-
---- pytz/__init__.py
-+++ pytz/__init__.py
-@@ -54,8 +54,7 @@
-     for part in name_parts:
-         if part == os.path.pardir or os.path.sep in part:
-             raise ValueError('Bad path segment: %r' % part)
--    filename = os.path.join(os.path.dirname(__file__),
--                            'zoneinfo', *name_parts)
-+    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
-     if not os.path.exists(filename) and resource_stream is not None:
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e3f6acb37351..ccd6da654899 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,8 +4,10 @@ DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d28
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST setuptools-46.1.3.zip 862431 BLAKE2B 89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2 SHA512 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
 DIST setuptools-46.2.0.zip 865117 BLAKE2B 490387146003e07a5391afa798d1e45a76e9afc81c3e0c484005b3b0bff15f172db2016907199fe2216a4e17379987a53d58149d285be6dcfe7c37a64ce7c359 SHA512 d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e
+DIST setuptools-46.3.0.zip 864654 BLAKE2B ce916b8f84f777a4baf6dd7458d5a74d7afbc0ede3a60238ce1e6ddf8b4c9837cd88508d4af4577be446d811fc9b997e9361775abaf9308bc9af6f66ca173bfb SHA512 57bc3e1a585a99d9434ed55af037a71665ee7e76ac9dbf19c87260b3d4331183f9eb3c7389c3455407f379ba28a74e90e27346afc614003ae259ab92e3dc16ec
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 EBUILD setuptools-44.1.0.ebuild 2242 BLAKE2B 5d25046d9212067075ed3bd31d2821a24e459fa35ffb3178103907042cb354a11251de89c8a8ef161bc9f6d0a28963ab8ba75ae13d6385cee8483c6112aa814f SHA512 5f5daa3dd6f118d6654d3b0e1d7d3bffc1a47d14f1e2d7ab9dc4a78c1ee64fdab0c9bf6117e30850c5db5e325f9f0551baaa36a6ea9c512f9cfcf1306230d278
 EBUILD setuptools-46.1.3.ebuild 2018 BLAKE2B d70e0fe5452b0700f40ed9670c41374b1a2129c7578bdddf60f867b68d2112c67b32aeed2f46afed80707e3488c42e489190e2dfe4211d42d63efdb706ffbca3 SHA512 f12c8c790feb0619153877c740b836e00127be4cdb719d16645d1136afa35068bb2f384d971457faf3dbc8a2f3fea968312cbdb2cd57548698f06e84e9e1041d
 EBUILD setuptools-46.2.0.ebuild 2086 BLAKE2B ebd4790c83f6e527cfa7b8ed4829ca7781546924d5b2e9a3f6d78b558fbeb272344d0fb39fed5ac608c991a4d270abc508a62e469dd59a78822f08adc7458df6 SHA512 86a3ca87f3d890f70fdee6386874916e0119b2cc06d210504fb13898c0196065900691621ebb7c8ae8cc9199ef90f90715f04b30a061a62c9c14ffca2db352ac
+EBUILD setuptools-46.3.0.ebuild 2034 BLAKE2B 2146b9d5adf112153a7148622a7f7f171d3717691dd1a622eb5775b560186e9359244d032036900c20f668e2ae199fc9a2404c0db56bf8b599897b3daec02851 SHA512 7c705c5913f0e0b521e3f5deeb209ed89c35a774d6f67e7391dee5838820f95b202457fe96a2223e45dac1f7c5f0a3820a6715784447a86d1357df324f7b35a9
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/setuptools-46.3.0.ebuild b/dev-python/setuptools/setuptools-46.3.0.ebuild
new file mode 100644
index 000000000000..8562f41ff110
--- /dev/null
+++ b/dev-python/setuptools/setuptools-46.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	sed -e '/xfail.*710/s:(:(six.PY2, :' \
+		-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 22f8332e3772..298e217bd220 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,3 @@
 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
-EBUILD six-1.14.0.ebuild 676 BLAKE2B 816b596fcaa18032f1042586bda6416458f532a9f8a613533024e059b21645c5ed61b1f82a66eba72e87fe0bf798d96fc79c3384ce1a9c47e4f2053bf255d557 SHA512 f84d9095be0e2d5ffd508b03a877e5760a5eafdeeb75248cb4cfefff7c71fccadd77ed1daad3ec005b81d321a3e56c8c87a2aa8136fd2e115258c25af89a1e0d
+EBUILD six-1.14.0.ebuild 689 BLAKE2B ff4f54f7fb3e48bbea4fd2dc414668e95cd55cb78ed55f91934e304de9b9ec95b3c70e60e144aaaa36d39ac8351f324293803deecd35e8b13bf096435e39a499 SHA512 3b89249aff7ee4847e88a3343096ec4cbf5930b16c1dba3d9dce77a8359157e7c2c45d2aef508d6a34d3349a1ef5973b496db898478339bc16fdbd7f574e8159
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.14.0.ebuild b/dev-python/six/six-1.14.0.ebuild
index de9905e4010a..2b7b9e966813 100644
--- a/dev-python/six/six-1.14.0.ebuild
+++ b/dev-python/six/six-1.14.0.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
-distutils_enable_sphinx documentation
+distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 17cd53f32d20..6731fe166c4b 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 702 BLAKE2B f96159d8529b23bfff9a7199ce39036a1cab18a4008e4f756c12be79717a716a065e91ac1a8dd5cc006483e5b066f9e9b0c4cb233988d485746cca4a6df726ad SHA512 cfcfb096542a91b36a94ccaea9068219eaf886808eb9b25e10528487c4067348b827d1b6de0be8769ec524e0e9e7bcee1e5ec42e1d3d77558498086f1ce599c0
+EBUILD sphinx-issues-1.2.0.ebuild 705 BLAKE2B 2e41e82c83053b9a439d7e23ce3dc6f7e1f1082983bef8ff4906c8dd6948c919bfeecb0fa1d21f1ed95115007d424a113ede5d52c821d956d9bdb7381017e1fa SHA512 4bdb3f93f31917dcaf7677bb93ca2b318ec885b0385e1de74ff32e5d963be33ed983e1cabda0b1e1f7ef40d9811f04a07485098294ae12331c3e2d945b7ea563
 MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index ba8c216784ed..caea3beaf700 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7})
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A Sphinx extension for linking to your project's issue tracker "
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 8e24536ae35f..9e6c34e3f57d 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1030 BLAKE2B 5329f61f5fa26ff2cf87e1b3efd1d0805664e2cbff8c48db017b2835af47882ca33c2cb36ba385c44d147b5486cfb4b9f229bf8e63362b78a6b4a64a2da29b76 SHA512 43cebf3bd2ade6a1d578b9788c8f18ce31e6be9042aa6350d569c7cca1ee912adcee3015962bb5b9b58eaadbe16a36cba3fe65dd206bdc987acd5e69759b0986
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1029 BLAKE2B f3768cf8e9e1b24f94b41389036b4e1a7236202af3017c8cb1a4c91c6571e41016ce3a6753801ac3d96a1cdbd349900623ca574dfc639e75ea13d746d4a65df7 SHA512 1cceca903eacf5daa0c5a413b353afccba9d49e57587632c09b123d5656204025573941e0f1cadd61056f1a023c321aaf3750c625011b1cbf35fbc3f1ee93f8c
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index b6d1c16c4f58..c7236280528f 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -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 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index 910d5eb7a6ae..c805059799d6 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
 DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 EBUILD sqlparse-0.3.0.ebuild 968 BLAKE2B 91e2d7dde49f9c32ba6a5269e68441b2df5563a37931dd48a0d8f22c9ce5981c86bc44084afc8595009ec0569ef0b48069edade3e98d10ee02db3da36d409849 SHA512 c4d340255b8bbc4d34f7283dee99ca3965a50f5bd8e9a724c29caf35214f661e4c1cc9f22ad10ed40c845ea6744405dd8ca33e56d8cb7a3f685809a697926a7e
-EBUILD sqlparse-0.3.1.ebuild 640 BLAKE2B 85dd5e86c0d848c97c7c5d5a26001b3227f2135a4928063b976d7ed9a3144ff7db3ec283b4f7bfcd18a1fc6a1dafdba8cac5d98cf6febda28446d6776ecbad8c SHA512 bfc9fb6fd272a084b62ffdd8617cf7ff422fa76a3bad59d54d45f1aa58737ab245b9c9b114fb0de6cc14459f4592b5298b9ba4869505c2b740b146cbd3f27477
+EBUILD sqlparse-0.3.1.ebuild 647 BLAKE2B f7ee01c33290ec7580e8e61ef2fa68774b06de47de2732bda478121efdeff9f9781b0b2641b8d37dea75d288aeebd0286441820ea65c3cbd20a400d731a17946 SHA512 174fcb19b753410407da1f71fa13531062765dfed36a6611703b0ed150f3b349c082dca2e8d28a8cc39808d2fdf59ea7a4953eab6412d1b623348a29792ba9ce
 MISC metadata.xml 384 BLAKE2B b35ba3bdebba668141b296a8e2c0d54b68015d6a6fbb0daa682e115ae0544da0fd588b3197dbc26e798214e5caf09dd01a46cbad9ced306a1052912826c41f08 SHA512 b54567937860fe8b488bdc27710f66692efe134520e32070734fcee1fcdb25e96a09117f43a5edc9f70bc6d7213814344fecb98b5576cf46ea85a3b5fd90b51f
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
index 24776e358cb9..8b5e082e4988 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -19,5 +19,5 @@ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-lin
 LICENSE="BSD-2"
 IUSE="doc"
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 0d841a43f968..fdd82aff4419 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,4 +1,3 @@
-AUX twine-1.11.0-tests.patch 432 BLAKE2B f912ae6e51652c299d4b99f2db69f6daa309f0a04e89205fa207e6ed8073c84b212ac6c24a344850b5d11e9a55eb0e6924c0c3306517726c262df1c298114c2e SHA512 a997ca1f2d077a3a23374bc816cc4d6d295c8912a3a28fa6bc404891fe6699e88d98febcf8867e137906b4e5994ab73ea0899fd5045768f30f482d845b295f6d
 AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
 AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
diff --git a/dev-python/twine/files/twine-1.11.0-tests.patch b/dev-python/twine/files/twine-1.11.0-tests.patch
deleted file mode 100644
index 386a4ebcf3ab..000000000000
--- a/dev-python/twine/files/twine-1.11.0-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Check for python2 support first, then python3. This should help avoid importing
-the wrong module for python2 where the builtins module can be provided by the
-futures package.
-
---- twine-1.11.0/tests/test_utils.py
-+++ twine-1.11.0/tests/test_utils.py
-@@ -19,9 +19,9 @@
- import textwrap
- 
- try:
--    import builtins
--except ImportError:
-     import __builtin__ as builtins
-+except ImportError:
-+    import builtins
- 
- import pytest
- 
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index c162b915f85b..9ecf05f7dd98 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,3 @@
-AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
 EBUILD u-msgpack-2.5.2.ebuild 656 BLAKE2B 4c812cdc4fb75508609297bdc65220cddb5448a98714cbf5981a5f3580da1a26ad1286eecffd9556d978ed67543d3ac013a03534e1e19ce85dcefe658338d006 SHA512 5472bdade655b333e9eaabb41c8483e002fcfcbb367151c56636452957ac1b8fe72c9a9644ac12250fadad9718589414d16d953f001c680260aca6aed190b6f4
 MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch b/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch
deleted file mode 100644
index c04aca3a3574..000000000000
--- a/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/vsergeev/u-msgpack-python/pull/31
-
-From 003289878812c63ef046dc7090953b8dde784f8c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 22 Sep 2017 12:09:30 +0100
-Subject: [PATCH] test_umsgpack.py: fix test on big-endian platforms
-
-On powerpc and powerpc64 one test fails as:
-
-```
-  $ py.test -v
-  ...
-  test_umsgpack.py::TestUmsgpack::test_pack_ext_handler FAILED
-  test_umsgpack.py::TestUmsgpack::test_unpack_ext_handler FAILED
-  ...
-
-  self = <test_umsgpack.TestUmsgpack testMethod=test_pack_ext_handler>
-
-    def test_pack_ext_handler(self):
-        for (name, obj, data) in ext_handlers_test_vectors:
-            obj_repr = repr(obj)
-            print("\tTesting %s: object %s" %
-                  (name, obj_repr if len(obj_repr) < 24 else obj_repr[0:24] + "..."))
-            packed = umsgpack.packb(obj, ext_handlers=ext_handlers)
-  >           self.assertEqual(packed, data)
-  E           AssertionError: b'\xd7 ?\x80\x00\x00@\x00\x00\x00' != b'\xd7 \x00\x00\x80?\x00\x00\x00@'
-
-  test_umsgpack.py:484: AssertionError
-```
-
-The problem here is in 'struct.pack' output:
-it uses native endianness format but test hardcodes little-endian output.
-
-The change forces 'struct.pack' into little-endian format.
-That way all tests pass:.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- test_umsgpack.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test_umsgpack.py b/test_umsgpack.py
-index a25b5b8..e500276 100644
---- a/test_umsgpack.py
-+++ b/test_umsgpack.py
-@@ -297,9 +297,9 @@ float_precision_test_vectors = [
- CustomType = namedtuple('CustomType', ['x', 'y', 'z'])
- 
- ext_handlers = {
--    complex: lambda obj: umsgpack.Ext(0x20, struct.pack("ff", obj.real, obj.imag)),
-+    complex: lambda obj: umsgpack.Ext(0x20, struct.pack("<ff", obj.real, obj.imag)),
-     CustomType: lambda obj: umsgpack.Ext(0x30, umsgpack.packb(list(obj))),
--    0x20: lambda ext: complex(*struct.unpack("ff", ext.data)),
-+    0x20: lambda ext: complex(*struct.unpack("<ff", ext.data)),
-     0x30: lambda ext: CustomType(*umsgpack.unpackb(ext.data)),
- }
- 
--- 
-2.14.1
-
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 316b4f1e3180..c8d6366dc20a 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -3,5 +3,5 @@ DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac
 DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
 EBUILD zipp-1.0.0.ebuild 1175 BLAKE2B 8db2f85a33a6054e92c8be22bf33a93ce6ac39d175734576e19a7891ac26f26a0cb08be4b07ac6652b0dfd0296f001c8a4d983a1d74851eae837a2d5189ded93 SHA512 6ac6030b7846260c5fc5adc16cb1ec601fe765110db1ff01e81cf57301b5077049c114663fd0ffd835cc688b766d2d6247b620444ced35d1412df303e555a5fc
 EBUILD zipp-2.0.1.ebuild 905 BLAKE2B 70547e97cae1c2a97c517ecd3b7001977e4ccad27f1d8710a9a00b1d9e1bb8cb216c4a3901dad9d2e026310bdc021d63785c842671fe96037277a91ca661b28a SHA512 51e57c1be1277f944feb93d280b50e0e0e85c634cefc332a8817175cf32cce0c63a2dc7c72b8acdbc2a9e53e621c96b9195654c3e68c459a8b338ef846cb6c93
-EBUILD zipp-3.1.0.ebuild 1130 BLAKE2B e2a714578b6bc34d3e23602848c1c78e92f96e63f596784321d8696086fc6bf4c91b56a0a6c655b5d3ae8a6b3efdfe1c36a1e4a6b915dc92afc7fd281183d1d0 SHA512 a3cd0da003a494234253fb2f9fe18c315ded3420ce7050e3581a4fd46582a06c85aa717a8ac52b7da561caac49e13ed968300634419a6c25d43791b317b974f9
+EBUILD zipp-3.1.0.ebuild 1129 BLAKE2B c15bfde6dccce3bc11611fb6193d1b45dbda1a0f60003116dc3b8c87d58eb80a373b255be18816f37b5c4ae99f13c51fb5bfe3b7b2b7f5d59045929bb4c51a99 SHA512 8f7e0abd7e42e066169cccaac517f4ca398f39e7a984ab543a5d7bc23828ad7f277c1c5d910eabc1f8991dbafc08a9a58120f0113266228b59f1aff7df7c00b0
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.1.0.ebuild b/dev-python/zipp/zipp-3.1.0.ebuild
index 3c56ad574e11..4c940d4244d3 100644
--- a/dev-python/zipp/zipp-3.1.0.ebuild
+++ b/dev-python/zipp/zipp-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 859588fc004c..1211fe36b922 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index e4aa1f038cae..397aaed0fdc8 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,6 @@
+AUX qtlocation-5.14.2-gcc-10.patch 1117 BLAKE2B ff43e3d2fa1b4accb03fc5dd1d1e3fa81797dec88c6c5c487a881c4d487d4d4888989087069cac7eb189b61362b8b0cba2b0eae207621e5627f3785a0df6ffe3 SHA512 ef27c87ff3d2092f9a9d115a93ab12e75da7e8cdb857c3acaae6175a3ce758c1c25b99719007b51ef6c1a6ac4d96915a2e89c9b9e733c164fd49a41433ab8d12
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
 EBUILD qtlocation-5.14.1.ebuild 973 BLAKE2B f301061d398d1a0670544c41babb551c02a738ce60ecbbafcc039092ec6bb2696dd02348c70d9444ea251e0d31e6567f701dccb3bab478bbcfa8e924717fa1e5 SHA512 768f565dda4866f4f6f7d700dc85b7d136a2720688416360362447f61937faf420afa92edbfc99f368ab06ef588fab20448bc4545400dad83076fa03da23ac7c
-EBUILD qtlocation-5.14.2.ebuild 1083 BLAKE2B 7366e3d73b577380d6fc2fbacf821bb3e33bbf7698acd4e403a02d3d55fd7aa286ed0974105e0077c59e1802225d6c224d0022f38c6a6d8c1d85d80e299e39cc SHA512 3898fb0fc06316d76a02f4fe31ca0f086cf09e07b1a2239f3ff7b1ed681186ad59af679713eeb6f3a630b1bad65ff843b02bda61c5f9a0c3ae2b8dd2f47c7853
+EBUILD qtlocation-5.14.2.ebuild 1141 BLAKE2B 44cbce547bd4cf371fad0cb98a8ae0d1bc33f4f63c7688eab01ca10a76422f883cdb1374477be25123aa7ff9f9554a23fed37f4830dbeee41f3785b6279388b7 SHA512 c2e066fb3abf180aadd47831522ebbf0db43691386a1bdc11add081a62317e8f105c2cfee7f4766217bee57bbac3014aef5585d97f03a36aa482268ae106fd48
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
new file mode 100644
index 000000000000..e7cc6f70d055
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
@@ -0,0 +1,36 @@
+From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
+From: Bruno de Oliveira Abinader <bruno@mapbox.com>
+Date: Wed, 22 Apr 2020 19:54:53 +0300
+Subject: Fix compilation issues on GCC 9
+
+---
+ platform/default/bidi.cpp | 1 +
+ src/mbgl/util/convert.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
+index d475c387b..c1710a6f1 100644
+--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
++++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
+@@ -5,6 +5,7 @@
+ #include <unicode/ushape.h>
+ 
+ #include <memory>
++#include <stdexcept>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+index 97bfe9108..510ff2386 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+@@ -1,5 +1,7 @@
+ #include <mbgl/util/convert.hpp>
+ 
++#include <cstdint>
++
+ namespace mbgl {
+ namespace util {
+ 
+-- 
+cgit v1.2.1
diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
index d7e1e290a78a..33f50e77187d 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
@@ -37,6 +37,8 @@ QT5_TARGET_SUBDIRS=(
 	src/plugins/geoservices
 )
 
+PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
+
 src_configure() {
 	# src/plugins/geoservices requires files that are only generated when
 	# qmake is run in the root directory. Bug 633776.
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8620bd12cadb..74634482bc54 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +1,10 @@
 AUX qtwebengine-5.14.1-detect-ninja-1.10.patch 938 BLAKE2B 570ec70494e8025d43aa666deb08610bb87ce493d724d844935f7af6cd59e1cc2e8967051d17d68a827abb27771cf7262eb81405ce1e429c0cd4563dfcc51209 SHA512 d9e4cac4fc13e97a3ef9e91956f76af4ea7bae7f7686e84f077c59411397b88eda7ce3184650cc3edba70af5905ffd14bfb92717e4fd9ae0957d6dff43f2f8a3
 AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
+AUX qtwebengine-5.14.2-gcc-10-1.patch 2550 BLAKE2B 121ea52ea2b90a4e7a2363c8c333732551b4ab79384762ecf85705fcf9f8ec02c3182e40cfa480bd1657b684ee7f7e5509aeee0a3234a6cd2f51461e83f86261 SHA512 f837a0ff89a708507bec7d9f773b23340db227a00ef77a8f618d81737130c1466435691a70681bea2850705f90e9467b196193b63c469b8563d086935dccc9d0
+AUX qtwebengine-5.14.2-gcc-10-2.patch 910 BLAKE2B 9cbcb19a0c17fa05cf1ac88e4cb1b80c1049f962844ef79b1d9fa8ef565d9c023cc2de2a7df58814fa060b0c3b037a036baea80406ba4ed7a3763da8587b471b SHA512 d42e08100334aa7b1d19f3d8a5770d5fc1c2c1cf9dcfe68c0e719758013c446575e643f3bad7a924591b72a8425965da2d4f7eba4b9726868c64281fcc45994a
 AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
 EBUILD qtwebengine-5.14.1.ebuild 3398 BLAKE2B 09f99f74123804158d4077e779f7def2ae28bc2d34cd2e9d303817874e80b9e9ebe54b6d1c1d68e933f22f8a86d691339a4ab867133f812ca97a83fc2373ba06 SHA512 b713b9c5a2ac86dbbccc90cfd62d2d2b9489db91c8bfb3288f09987f23f3dae5d49d787d528a6bece0e1b50a87975ac62866024b4078587573613adf8690b1af
-EBUILD qtwebengine-5.14.2.ebuild 4450 BLAKE2B 87ca6b364d131eed3c6372e5532d5c4029eaf131af7e519548aa2d5debf7e4d304eafd73d94a298dc19b7e824a09c59cf3d5698fa4773af3bf1ada1be0fc863b SHA512 c949bd8122e17a85473465fa45998da14e843d45e347ad2064725135979b28dc9bf84b3d657ac96af9335ab69717734e4723311a1d1eaa28fb7c26f34d2fdce9
+EBUILD qtwebengine-5.14.2.ebuild 4515 BLAKE2B ea63f74b12d681213c8c58400387e7e423601b5db05c0f54828de33895a8c3b6dd48ecdf127e8636a563ce35d88fca6fafead98d3e799f99a1648cb61e997b36 SHA512 acb08fa8f92d2df8cc8fdb1af15be2360d13dfdad993f2136758db1dc1d2787547eb03ea3c31b4fb7735146fba8504c22816c11dc01de546396de581463372af
 MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
new file mode 100644
index 000000000000..214bf76a6524
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
@@ -0,0 +1,64 @@
+From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Tue, 5 May 2020 07:50:18 +0300
+Subject: [PATCH] Fix build with GCC 10
+
+Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca
+---
+ chromium/media/cdm/supported_cdm_versions.h                      | 1 +
+ .../third_party/perfetto/include/perfetto/base/task_runner.h     | 1 +
+ chromium/third_party/webrtc/call/rtx_receive_stream.h            | 1 +
+ .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h   | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
+index dbe59ba5ea7..5216cfe3ee9 100644
+--- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
++++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
+@@ -6,6 +6,7 @@
+ #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ #include "media/base/media_export.h"
+ #include "media/cdm/api/content_decryption_module.h"
+diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+index cf60401238f..ee4ad255dea 100644
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+ 
+ #include <functional>
++#include <stdint.h>
+ 
+ #include "perfetto/base/export.h"
+ 
+diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
+index 8ffa4400a9c..66cc46dc091 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
+@@ -12,6 +12,7 @@
+ #define CALL_RTX_RECEIVE_STREAM_H_
+ 
+ #include <map>
++#include <stdint.h>
+ 
+ #include "call/rtp_packet_sink_interface.h"
+ 
+diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+index 22528c94892..69e624e8b19 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ namespace webrtc {
+ 
+-- 
+2.26.2
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
new file mode 100644
index 000000000000..9a467f5d66bd
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
@@ -0,0 +1,27 @@
+From 0dc7c21c33de634bb6bf90c9e2372054436e1606 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Thu, 14 May 2020 16:31:09 +0200
+Subject: [PATCH] FIXUP: Fix build with GCC 10
+
+Add one more missing header when build with pch
+
+Change-Id: I42cddb26eacbd18cfbdb359ae1a85d0e2e43316f
+---
+ chromium/base/trace_event/trace_event_memory_overhead.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
+index 69468d46409..916f9c775a3 100644
+--- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
++++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
+@@ -7,7 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
+-
++#include <string>
+ #include <unordered_map>
+ 
+ #include "base/base_export.h"
+-- 
+2.16.3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 78e614ce1235..3ca9d6f594d2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -80,7 +80,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.14.2-icu67.patch"
+	"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
+	"${FILESDIR}"/${P}-gcc-10-{1,2}.patch # bug 721876
 )
 
 src_prepare() {
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 86108bb21568..8ddfef62635f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 1e308b49b821..64cbb3adbcee 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -5,7 +5,7 @@ DIST rmagick-4.1.0.tar.gz 1977887 BLAKE2B 08d55b9bd154ced069dfd3bf58edd3d6ea9fb5
 DIST rmagick-4.1.1.tar.gz 1978761 BLAKE2B 489d355237379b7efb5e1d82b71cb2e6f8607cd644933c4d1d1116f464604262388aaf8534ed322c6b44291aadc3abb75e1bca94110c01fcde228b6fd9bb9ab4 SHA512 08d5a730281e7aa44fa955c8af06649efc77702dbc979f5de34f2f3b39798d494a0df8860a25746d89256c7ecaeaa140e4e5d5cd60017ed4412075a790976a5e
 DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
 EBUILD rmagick-3.1.0.ebuild 1556 BLAKE2B 7ccb8f7c5f1cbb569eab9840b138293d1b97e83a86d5f3b352e4166e074ac2787e1e952aa1323d94ad6f8c38bff28e6499503fe2bacb643c13aca43d1a0bf580 SHA512 8f0b01f3165d84c1062e186f74791989e192a47bcc8c5e762a7f6daa7df863daba24a0525f7b1f41e43c30a34a349bcb50830863a6c9fa21c77320aef5dc3e82
-EBUILD rmagick-3.2.0.ebuild 1583 BLAKE2B ae59868a3c39add74bc089bf4a11c5f1ce2528ef989823f7cccac722fceb465bf10bc9057944c2df9325be770c0309d988b8258f08d3a15d1373f602f3d2c023 SHA512 929a6f9393801b0d785d5a6582ddafcb96e31e93f883095db412545ac7484ebd53542ed73672d62cad3dfc78c73b73e0005c9af7b60f6544410e0512b9d29e37
+EBUILD rmagick-3.2.0.ebuild 1582 BLAKE2B 2444e14e907adab5658013115801d453787186933c20b80dad6e25e439d4dbebc2d8579bee13f20d54f0105ebb7be8611df471803c0cb0616e5c7a90ed71c390 SHA512 a1410cac8299dd2debc536aa821b45f62c0db4cefc1dbbef044083c68f5db13753b628823cd2e68f0d177bd0e63841578e1511efe16e96dce037ec06c4dc12f4
 EBUILD rmagick-4.0.0.ebuild 1571 BLAKE2B 1ea72c8b636c67e248434986bd052386e66cea115d8a5bddf44ff22d542a371f72d3a9d8374e70c22da840bc22ce0e87b92f462ab34dda713df2ec2048226e92 SHA512 7f41467a28f7de463d1376f842badc3328d962b3aa8d7347b746c0f54bb8ec89fe74afc9b85b611c8a45ce90a66879966f934f22211419df7f0da01877b349d5
 EBUILD rmagick-4.1.0.ebuild 1706 BLAKE2B 8344f0a135f100960f79fbd1564e3d29d8c90cc161d1c48084b27b40ddac2a9c1dd7d376d5a1d2328205ce664dab4054caeaf91494de1901a27932faa7f9d1f9 SHA512 74bee173cc6739247cbcedabca764ca95ce34759cbacea2b8356c88d5080c38b2b9ee182058ddde10ac3f16a0d3784bb9c09a00ebdc3f41264a8b5458c2e0bc2
 EBUILD rmagick-4.1.1.ebuild 1811 BLAKE2B 47500f1d99dd0a063fcbdf136e0c1f22a35d653950d8bbd5da04357673c0e38ef6d96bfeb9e2e4e26d90a67a2ea5830040b8ef73e2b9e84faebbdb63776884f9 SHA512 9d7533a06af94eef5cd1b48a637dc685c73441bd5c469a2fdd0eb8921d42c7a140716c3e8b5028111a8d9fba114ab889587f1ac35a8fbbb5415a86dcde92c593
diff --git a/dev-ruby/rmagick/rmagick-3.2.0.ebuild b/dev-ruby/rmagick/rmagick-3.2.0.ebuild
index ea952faeffeb..0fc91a2a4dad 100644
--- a/dev-ruby/rmagick/rmagick-3.2.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-3.2.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index caf8f19d00fd..967338df4f3c 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index edc5f408f72f..d3e7db5bda8f 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -1,4 +1,3 @@
-AUX pedigreeloc.patch 811 BLAKE2B e8afc504a25e73b1ce70ba3afbdbbc64e99e62efccce84e7987f05e27d91ba0582e1ff74a53b56ec73d33329d77fae0672688f5a4fea1f09009ea5c78a84ea0d SHA512 73e13f8e1d457b4d80d17409bf9a0a02f12415ca835e719718753d8740fbd083430f184b9dd6928c07f90f6f65169c6b0cdbb224bc9a3b6bead27010d628f382
 DIST tl-auto-pst-pdf-2019.tar.xz 2596 BLAKE2B 4a5298695caa6facc33354b8318373000de44dfd264a2498d694710b67768e47806cdf8aa75ab4b6de846a62b6ae5febd78069feb2b2c70d29b3c7daa395ce10 SHA512 383de50023906861e45b9d6330962e89513aac0448a06af36057d4266ac1657fc49f650dfc9d3709f5f50879e6912ea93246225651412e8c919fe3ce0eb77f58
 DIST tl-auto-pst-pdf-2020.tar.xz 2616 BLAKE2B 1e1067c7effbf0b3b68c6fc2abee262b3b0edf0deeadb3abc250dfc601c9fea8608d8eb3a98ca861699e59c2548330915c445dd9307283a2dd9b18dc716f9b31 SHA512 2737915601138794b675c44441e71c372d7d2f6fa8d9af3abb2a620582c6c6f11853de0ca7410306e5279012ab3992ef3e40ea115643efe9eff7257b71686f73
 DIST tl-auto-pst-pdf.doc-2019.tar.xz 318756 BLAKE2B f3a66abb535f9a2dbb7aa303aed213400bc330d7cc17f661a2e37687c150d93cdf3312280355f2329e39b3a07d40acce533cbcada51a5553163591badf4b3cde SHA512 bb0682378d96bef60480b8155d1725b21c89c5be04ad1a6dc108da871d8e25001be0d696cbe806cd7e4d69a9005a54f71d601fd67e322f22dcb17d0dc6addfea
diff --git a/dev-texlive/texlive-pstricks/files/pedigreeloc.patch b/dev-texlive/texlive-pstricks/files/pedigreeloc.patch
deleted file mode 100644
index b518d4a1d263..000000000000
--- a/dev-texlive/texlive-pstricks/files/pedigreeloc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Let it find its .pm files.
-
---- texmf-dist/scripts/pedigree-perl/pedigree.pl.old	2012-07-26 11:54:47.578188341 -0400
-+++ texmf-dist/scripts/pedigree-perl/pedigree.pl	2012-07-26 11:57:53.420470694 -0400
-@@ -110,10 +110,10 @@
- 
- BEGIN {
-     # find files relative to our installed location within TeX Live
--    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
-+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFDIST`); # TL root
-     if (length($TLMaster)) {
--	unshift @INC, "$TLMaster/texmf-dist/scripts/pedigree-perl";
--	$TLCONF = "$TLMaster/texmf-config/pedigree/pedigree.cfg";
-+	unshift @INC, "$TLMaster/scripts/pedigree-perl";
-+	$TLCONF = "$TLMaster/pedigree/pedigree.cfg";
- 	chomp($TLCONFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
- 	$TLCONFLOCAL .= "/pedigree/pedigree.cfg";
-     }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2b255ec59e28..4d3c34e23687 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index e8874aab249f..03970ab98439 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -5,5 +5,5 @@ DIST buildbot-grid-view-2.7.0.tar.gz 13342 BLAKE2B f37d7466d346c2db4083bdf0226f4
 EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1120 BLAKE2B 7e8aa94b431619138e8a9868778b51b3048bb397082ba7c5647901e7ab23d7c8d5eed459582be1ae9b86b6588f2b3ad6bebb994c2d5d27dd29611655881978f2 SHA512 051c0d4d9717fcc337ed57d7ffc203785009bad76598fc50d157bb7ddfb0c8f96e8fb42205bae646aa247a0c62c2241a87e1b751e0e914541ae025b3882cebf9
 EBUILD buildbot-grid-view-1.1.2.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
 EBUILD buildbot-grid-view-1.3.0.ebuild 1116 BLAKE2B 89dc619bf4864378815f480186f9cdacca9a53faff1d61cb2d1ade34742e6eacdd311ed335b6cf121acdb815fda2e2d35f1e27025d19c9c6cbf7e884b6fe66ee SHA512 184864ec78acead7d6467e1397c1d7ce13b1eeba9f69b734f7457d1da9fe643146ab78b718d308017eb1583720942b7749826f90d9b170ca52b479bfd4a4e5d2
-EBUILD buildbot-grid-view-2.7.0.ebuild 965 BLAKE2B 9dde12e63b0470e1fbc8b772093b58c8fbd49f409518bad13f64fb18a84f705f093056cf29cb002d9b121d85ba8b0734545e89fe47d68584890fa197d78ccc7c SHA512 2c8e7080c13053ece7e89d99472de3406e10b7a2a26809b522b1c37a02895130167d80429dd61a496e5022e9b6d68522827dd74d0c128b0150cc74f03111fe47
+EBUILD buildbot-grid-view-2.7.0.ebuild 971 BLAKE2B 4718358889543a5c5080e754545927975ed1ca5b507671e79669c24b42b369f19b2ec9517765886ff5e6acb3644a8adaead1466fbf8e9d02c2bf8f4522555b3d SHA512 393978409823602087a1ea8cc8fbea175eaf17ab21d6958d4ecfc5b41312390bf376899ae92eec450dc04f946bd52a4718fa1a7cd399fe9913e36b3cf56095df
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
index 7a1bd3bca2cb..20e61ded8bd7 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 32faf243c1ad..3918d6df92c3 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,4 +1,4 @@
-AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
+AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
@@ -8,6 +8,6 @@ DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7
 EBUILD buildbot-worker-0.9.12.ebuild 4818 BLAKE2B b685b7deeb4fe497dac792fb308f334f8652462b4a16966700e5ad5dc676281e533e9be7e59f62cd70d7904b698d32961fd480aaa03460fad38c33e00a1857ec SHA512 632c8e4b67585278f26776d7f3501b741102b68471f7c0ffc01dc3e1da092fa04ae631ccd6215747bc2e82f6b88acafe7cf7c86a88841c928a712301c0ee42f6
 EBUILD buildbot-worker-1.1.2.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
 EBUILD buildbot-worker-1.3.0.ebuild 4823 BLAKE2B b47514c9c3b149cbab12af9223533c2255a8a08252df7b0830a8909f3bd2dd8361e2046dd56977ceb67106b66e9d7c51129fc4a1539c9638cd3d8cce3dcea48d SHA512 1860190cd09936cd96636c4e9b63a393dc6d1d09447aa9f8292a29634b71a1f7bf946776b17b10a1c417b76a1361936a587d0bd4966a6d6285f97cb7b5e4d30f
-EBUILD buildbot-worker-2.7.0.ebuild 4700 BLAKE2B 21418b3bc8aafd3373d97cfba32b5596d7350b6a89db8d79653dc1d755dc844e5bce039dfda33d424b23fd486f12672c30697c077eae259a53564510974c97d4 SHA512 36189ac527dd2cf32e188bc24277e6e8f9a69124cd3f4d17ff855a6eb8012b483cf8a2995149cc9c61df116e8b7522f3277fe2652033ad9ec9366ba6cde1ab6e
-EBUILD buildbot-worker-9999.ebuild 4700 BLAKE2B 21418b3bc8aafd3373d97cfba32b5596d7350b6a89db8d79653dc1d755dc844e5bce039dfda33d424b23fd486f12672c30697c077eae259a53564510974c97d4 SHA512 36189ac527dd2cf32e188bc24277e6e8f9a69124cd3f4d17ff855a6eb8012b483cf8a2995149cc9c61df116e8b7522f3277fe2652033ad9ec9366ba6cde1ab6e
+EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
+EBUILD buildbot-worker-9999.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
index 4c141f7b3544..be5258cd9984 100644
--- a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
@@ -114,7 +114,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
@@ -122,6 +122,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 4c141f7b3544..be5258cd9984 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -114,7 +114,7 @@ pkg_config() {
 	if [[ ! -d "${instance_path}" ]]; then
 		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
 	fi
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
@@ -122,6 +122,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"
diff --git a/dev-util/buildbot-worker/files/buildbot.tac.sample b/dev-util/buildbot-worker/files/buildbot.tac.sample
index ee3d7ca3cef9..19bd941911bd 100644
--- a/dev-util/buildbot-worker/files/buildbot.tac.sample
+++ b/dev-util/buildbot-worker/files/buildbot.tac.sample
@@ -29,9 +29,9 @@ maxRotatedFiles = 10
 port = 9989
 
 # worker settings
-worker_name = 'worker-1'
-passwd = 'mypasswd'
-buildmaster_host = 'mybuildbot.foobar.org'
+worker_name = 'example-worker'
+passwd = 'pass'
+buildmaster_host = 'localhost'
 keepalive = 600
 umask = None
 maxdelay = 300
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 1d973402ebe3..22c7f8dc8135 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -5,5 +5,5 @@ DIST buildbot-wsgi-dashboards-2.7.0.tar.gz 5573 BLAKE2B e50576da2a86c3f63435c6ca
 EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1160 BLAKE2B 8b11516a18c7ab3e00965878abb996b9f6e25726af62b9d7c6124efe2fa9891b5b5001d6c2a4cddb682eb996abcd92e767390decdc63302991c1f4b4d4ac0caa SHA512 8fdf990e134ec41009326fc97784097d6bf277c2d850738f1c883a880d41bbb22ce165fb4b71a8ccce11afe9fca6e72941556f5edefeb91b49652422227b1c28
 EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
 EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1160 BLAKE2B 513b4f9caeb71b2b538d7b1bb7e4460b0c5dbd7fc59d2a9ded597fb72576c43a5ac458f4a3721ed6eb8d36786957c74e528df0cfe22adabb39d52c98b4c280d9 SHA512 ac771c690204607251b7f3dbdcd21439660a78c04744403fa7492619ab9074418d4810cd9c967845eddd5d328a54e145c940c829374d25850fb3457b507dae38
-EBUILD buildbot-wsgi-dashboards-2.7.0.ebuild 991 BLAKE2B 68408ea168348319f7b56c5fc179af923a7fd131a6a861ba7cee03c6d5c120898f3f5cca9077d7d53004277c38a3333e694b026048120aeda9e469b48b585b9b SHA512 71349742789e06e529848ed3f31b3121e4bb53b3a1538a01e38951a6130d7c830388586b92a323fcbd50f9b297c23d26c16bc9a3e3cb47035c96fe3ba1def349
+EBUILD buildbot-wsgi-dashboards-2.7.0.ebuild 997 BLAKE2B aea4b3352b6a2800846f11d2b2aae38d45cb7900bac975e2eff8dbee47b840fc235da2f6985c1d5396ce7a0a8a99726a09d26b9d357e26e844f410bb8eab4701 SHA512 1e12927a4530ceb2528f84c094e12a2761a5b94df7c3002d2b58cb1a358e4261dbd8480f1c5480866567da8a4b142c54cee26b493404570ab0a44ea697336cdb
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
index 0a4e665ac500..631f56af346d 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 36d33b15d932..da1edce16e6e 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -13,6 +13,6 @@ DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6
 EBUILD buildbot-0.9.12-r1.ebuild 6444 BLAKE2B ceacfcbc66a0fb1e927cacbd456ef023145c475ff42ff64eaa603e1db295bec38cb7939bf577410234f16e3a851c2a41d99863f4efdced715e7d2ebdd015e3ed SHA512 8857547742c7ebe0f8fd5a5919a0e1cb5fcfd34cc35f6fd5c56f7305fd2db9bc72e5d805077ae3f041dd1b16d8825c69cd0062c6dd181db5d781512269266f10
 EBUILD buildbot-1.1.2.ebuild 6558 BLAKE2B c20fe0973f6cec4336f3d60a2c94f71ccae7cc5cc819549bc0e84f748f307d4e2e0bc5dd864a612b6dfd4ae9b3ab3f7ca9693e407dca414882ecb1d20e15078a SHA512 477c80abc713c6e62754fae6f071eeb0401f719a72c491a3a5932be8364ccc80fb2c1fc47c8093f558974a00151b8db3bfa34f3c4a088dec75d5d59ff4e6e63a
 EBUILD buildbot-1.3.0.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
-EBUILD buildbot-2.7.0.ebuild 6850 BLAKE2B 2df4cd28964315fe41c4f2f1b6ed576cb8572443746bdfb3d4bc02cf20723bd5f9b9f34b35ee4b6c74c778c44a5121c5d86012914a7e944eaae610568bf60f56 SHA512 89c964b5f008379fe308e1225f79da8dfcff13f2d7920c6bfb93ab46b01a690be5839fb655704e6656d9027da7f1e8ac855f2f801f5d8b6eaec105ed1cc0f1b6
-EBUILD buildbot-9999.ebuild 7572 BLAKE2B 94e17860c213d97468af9fafa9334ed16ac64355908b63c396f42dd85e867e150183ee4efe348c935cec9a845ea01cffd176a9218384c431e90a47e92585f719 SHA512 5384b4997cc51d62ff526a33d68256bf0e395673ad8b7f6b607adb62c4a966808eae34ee6174bb80da55cff2abf0d5e25e250a26641f841e82754212f16dadc9
+EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
+EBUILD buildbot-9999.ebuild 7696 BLAKE2B 6998175d60b79660f0493080732f8fd445d11ffa38873399ad50fc05e9973201345846c05375f8d182afe3a267f562dfe862e146aa89da37437aa744e944fcde SHA512 f77d99e0733af692bf4237babfbe6a4abefdb281c116a1e6113261b441bc9bec993bcce0d79208a0a8a05bee6b5a832335e635afa2513d15239c3514d92c5649
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild
index 1769ba6f1d19..01fd9b609492 100644
--- a/dev-util/buildbot/buildbot-2.7.0.ebuild
+++ b/dev-util/buildbot/buildbot-2.7.0.ebuild
@@ -173,7 +173,7 @@ pkg_config() {
 		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
 	fi
 	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
@@ -181,6 +181,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index cdce9bbe8ff4..35a2e69c15ec 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -201,7 +201,7 @@ pkg_config() {
 		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
 	fi
 	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
 	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
 		|| die "Moving sample configuration failed"
 	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
@@ -209,6 +209,8 @@ pkg_config() {
 
 	if [[ ! -d "${instance_log_path}" ]]; then
 		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
 	fi
 	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
 		|| die "Unable to create link to log file"
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 65db3afc6528..e8aa23a2ab43 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,6 +1,6 @@
 AUX kernelshark-1.0-build.patch 1288 BLAKE2B 4d79cb34c04186edf9a4787463eede7971177ccfa64988e931345ce66b86003482f1cdb6bb2609f3a7696a18f644204d61b85ad10988347c0db6ee23335ef873 SHA512 f257b73da9494297a44363a5126528dd03e018050464d12b414c4eb0a157da550318a430f40df17db0cf4e0b49feb904c071be42685c3cf64bf455ff9c2d0779
 AUX kernelshark-1.0-desktop-version.patch 313 BLAKE2B 64663bb60499910061328169e726f75e10f843c2dcf036f31954307ffeae863bedaca259ef8d6f1bb653f14c45ffd4a83d2687ed053263526001d8aa175ecaec SHA512 33f6c02a5c8328af71f12a452fa3e5efba1300977397a1382b1e4c04cc5e49fc6c50f95555a294b57ede4616e04bc10c7b8849010ca2a63cc8c1eb266fdb13af
 DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
-EBUILD kernelshark-1.0.ebuild 1310 BLAKE2B 881d75f265abb22d9c7e8355e251031b8e3036e8c05e8a0c08a1898bbee895f94a1866f7fa4a176b793266b828c0c4f501199b1e1cee424ede90fe3638af2c3e SHA512 bd8295660c90ab229596eadfd548e4f3410e0c0d0de2360744cb83cb810d1efbffebf822908cfc00b7c1956376088da9248401fe0c442ba7577f98310ba4439a
-EBUILD kernelshark-9999.ebuild 1310 BLAKE2B 881d75f265abb22d9c7e8355e251031b8e3036e8c05e8a0c08a1898bbee895f94a1866f7fa4a176b793266b828c0c4f501199b1e1cee424ede90fe3638af2c3e SHA512 bd8295660c90ab229596eadfd548e4f3410e0c0d0de2360744cb83cb810d1efbffebf822908cfc00b7c1956376088da9248401fe0c442ba7577f98310ba4439a
+EBUILD kernelshark-1.0.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
+EBUILD kernelshark-9999.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
 MISC metadata.xml 409 BLAKE2B a224422be52a292645aeafbd692638a1f07b1cce88debff7f3a25b9cccd02674ac1e448cb9ac329be6b8f3ff869c0aeb2d205d0930d9d5828eef88dbd295204e SHA512 2e9b3fb0033679637107c2c317fd98c0bd06ec7f8afc3fd2b7b3feef4a7188e818f3f82c6dfa704770b5c71b823e611b3d1445f22bb27ee42c2fd41c368f1708
diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild b/dev-util/kernelshark/kernelshark-1.0.ebuild
index 44d6447fb0ee..969302e6c70a 100644
--- a/dev-util/kernelshark/kernelshark-1.0.ebuild
+++ b/dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="http://kernelshark.org/"
+HOMEPAGE="https://kernelshark.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
diff --git a/dev-util/kernelshark/kernelshark-9999.ebuild b/dev-util/kernelshark/kernelshark-9999.ebuild
index 44d6447fb0ee..969302e6c70a 100644
--- a/dev-util/kernelshark/kernelshark-9999.ebuild
+++ b/dev-util/kernelshark/kernelshark-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="http://kernelshark.org/"
+HOMEPAGE="https://kernelshark.org/"
 
 if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 37adee7a15f0..377e18235ad6 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,3 +1,3 @@
 DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
-EBUILD opencl-headers-2020.03.13-r1.ebuild 608 BLAKE2B 0e78894e0df7523633b3eb64232ab26f1fc43c94b5b23064dad52a044772bbc6defeca754aa18d69002671b65147ebe31057c17e0a3c8bfcd65f7ff75921e43b SHA512 1f5a79e4358658f909d0954aa392cd47df7702a8a5c8d2fbcde7e0f7696411d0d8530d7310c902e1b7cc8723cdf84f7cbcf57af18a6002be4a15c3ee52c2c76b
+EBUILD opencl-headers-2020.03.13-r1.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
 MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
diff --git a/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
index c13c26d2614b..cffb61d415a4 100644
--- a/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # To avoid file collisions in /usr/include/CL/
 DEPEND="!app-eselect/eselect-opencl"
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 9e44595f9bea..0cacf716a6f4 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
 AUX rt-tests-1.8-musl.patch 10834 BLAKE2B 54bc0e20a9bc7c251985b8e21c94b0e6261345d02a23dc510ee6a303843ea88aa13750680adb3954d63561246dfb26e6427adf2bc2012f9161357d0fae207b83 SHA512 196b0d1d19aeab83710edddcaec7064d4e4770cd514f8b8a61b23980932b793d044cfb4d69c91e61c4ee912eb24cd3a87ee8da05612c1ee02e2a5885f32bb9e5
 DIST rt-tests-1.8.tar.xz 105820 BLAKE2B 478ac14732393f718e6be818b82b24b1e53d2f293140012bc17fd1c9242bd885b4d70dca3c7f3187e9ba22334e5f83d9ad1993ab9f70079e1765b918deab4411 SHA512 41c0b18e84d1f76de22a4ab239d43ac678b8c8419b508c96204bef346734122b9a42df51fcea97b1e0675bd25ed1e262730236ec0cb189732d5810122e96aa39
-EBUILD rt-tests-1.8.ebuild 840 BLAKE2B 5d5e2ade599917bc4dd91fcaea95947704ccfafa21c704460f8ea927055f71d5b2b65bde93aa37c0eb8217b51fffc67e94e1da0cd9e0acca3295d8bf3331e04c SHA512 c68ca6095d2421222179df72c0993e48b36d18e198902aada15c545df283f81685f555de30994d004916469acb0e7caa2981748e251e21ab624e7a9810641180
+EBUILD rt-tests-1.8.ebuild 847 BLAKE2B c55213743b396727a0626ccc80617f6b62722ba93fb9c0245981b896a02bbf1fe757e0f22a6d783b4e58ab95328526b1505916014491d764ed844b005589b88a SHA512 b36dab246f8eb4477183e7c1ffb5f65f997f5c2bcc9b7bddd3c301f3da1e5b65166b83a7fcb42fb28315446f28e0a8f2f79eab7ed62fced4e8ac88c100caedfd
 MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/rt-tests-1.8.ebuild b/dev-util/rt-tests/rt-tests-1.8.ebuild
index c6392a91f932..994e2f56115f 100644
--- a/dev-util/rt-tests/rt-tests-1.8.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index fdc138dd721a..4d72b8bb70c2 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -4,5 +4,5 @@ AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd
 AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
 EBUILD trace-cmd-2.8.3.ebuild 2523 BLAKE2B 615d9186fb476dc5a49f9ef8f9bf2286fe0921236762b76120866050fa23c2782cc03e8a9c73dfae110e364be8a6b65834a4cd6844b7caae851593e9a24f068b SHA512 ff83354331a3c7eb5bfe3ee96c7fc667d841db0bd0c7de3f6f230f0eec4bf93ceac85a1024e89ef744435cd8e333380014f7958759e922cbc934dfe54a5914cb
-EBUILD trace-cmd-9999.ebuild 2216 BLAKE2B 616f124b5f3cb45821c780fb335396e261ce8e926cf729852a4818a38db7cbac25c7efb28dcea4c816766bd489d64805881209f8e0ec99b37f21ff5aee928073 SHA512 79cd77c02babbdf464082a8f39b33da85e6c4eddbd4d8552d51168d879a5837a74f880d102e7a7d1bbe0526690c4d82156080d69cb116476fc003eaec2ff6400
+EBUILD trace-cmd-9999.ebuild 2217 BLAKE2B 833d79cd9903e192914760299c71da81c481d666388cafaf6470605875a747a8c20e25b4718af7bef6e8d71516ad3811eb391d7031aef1c11409c526eb55d2ce SHA512 223fce0fd6398dc101a60788b00c814246c420385f8be16a871cdf74ec4f8f55814729ae823f4a53bdd333ece36c0fa7e79781d78d4c94d1195da8cea0e80485
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index 78357b959a18..0e6a0b207cb1 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1
 inherit linux-info python-r1 toolchain-funcs
 
 DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="http://trace-cmd.org/"
+HOMEPAGE="https://trace-cmd.org/"
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index 0f9c5f7bcb96..d18c7865186d 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,8 +1,8 @@
 DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
-DIST uncrustify-0.68.1.tar.gz 1566201 BLAKE2B ca7423088a2059d522d915e23bf1cdecc70d0adf64b9e7af53bfb4185252e4938105696623ba53b7f8be817e9e5ebadabf63417256e6f2b484dbebce868392be SHA512 03df7d2c3130f44021bc86599eae3acbd8dc206f647b476f63b0fe6add207c105c15f9481d6efa6b624d55bfbaeea050d636eabafb30a71a4de9ec8db6fe92dd
 DIST uncrustify-0.69.0.tar.gz 1600390 BLAKE2B 89f194679fe0601c866cb239c8fc900bd4ddf9f5ff23bdfe82df06e284f89f02bf8513153a908aa3bea4a075010bbb022aedee8ab7cd6df8b7922364d8d5cdeb SHA512 06eb985b941bd595c037c71becd277ed68298bebb56e9cdaba5da8315812a43a1455eba8635f370e2b039e665fa89891042f520933b7de5677bdcfb2dd69e6cb
+DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 EBUILD uncrustify-0.66.1.ebuild 765 BLAKE2B f42a1a63aac961eea17b1ad905c8c4eb86aff8068cf84f2cae98ea8127e948c99671146ccbb31ce2c3fbed32379a242c12af114504886c325a253ee08c2d0a3b SHA512 20fa1b76422958c787555f8fed41e53d423f87fe3d0fed653665c3cf08ef9677dd9ab1961bd39b930be9e224fbe84f16cd15c39d97cd1139be0b2ddf3cff5223
-EBUILD uncrustify-0.68.1.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
 EBUILD uncrustify-0.69.0.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
-EBUILD uncrustify-9999.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
+EBUILD uncrustify-0.71.0.ebuild 697 BLAKE2B fd0e10e65699f94e5832618baa4bfb69338d352ff348aaca442696235146d17f2f052959bac69549400fee95c4ca73ef0186bd4ffa80f7494f363e6196c345ca SHA512 9edf623f799b347a8cc0ae540c72e7ae9be6e7da940628109e1cee789af5a09319d15fb7e34cd39b3e0e03e1e78e7b9c2576e676afe3b524f43f807147bc0abb
+EBUILD uncrustify-9999.ebuild 697 BLAKE2B fd0e10e65699f94e5832618baa4bfb69338d352ff348aaca442696235146d17f2f052959bac69549400fee95c4ca73ef0186bd4ffa80f7494f363e6196c345ca SHA512 9edf623f799b347a8cc0ae540c72e7ae9be6e7da940628109e1cee789af5a09319d15fb7e34cd39b3e0e03e1e78e7b9c2576e676afe3b524f43f807147bc0abb
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/uncrustify-0.68.1.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
similarity index 81%
rename from dev-util/uncrustify/uncrustify-0.68.1.ebuild
rename to dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 85a400d29cc3..ffb8d0941d9f 100644
--- a/dev-util/uncrustify/uncrustify-0.68.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ fi
 
 inherit cmake-utils ${scm_eclass}
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1
 
@@ -27,8 +27,3 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index 85a400d29cc3..ffb8d0941d9f 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ fi
 
 inherit cmake-utils ${scm_eclass}
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1
 
@@ -27,8 +27,3 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 20e6e673a268..b8c1ef2ea141 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index eaece2cba787..26440ad504db 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -6,5 +6,5 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b
 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
 EBUILD subversion-1.12.2.ebuild 15517 BLAKE2B 6a8573f750eb273d22f67a7857652305284e8b8fc7a32fda5a00f9f826854635ef7c708cae0196a10c41804881ec5f3fa68f35415eaf3073efe4a6dae79fd965 SHA512 051325815cbea5de0ecc001c5c7d30156dce016082a92ec038f0298de24d8fde4b07b506d82567c3ae932b98466fed13da1cf790c98956f73c37a277ab1ca5fe
-EBUILD subversion-1.13.0-r1.ebuild 15769 BLAKE2B cb202d51b71eb28182a3d5a38bb3cb00e4fc49025b4b014b7fcea7fc9c305d3aa9f04aaa93408002faf7bd534815e72ab3f9122d2fd72faaea4bdbf5b29fac8b SHA512 299e5c61777386a5c3e468c9a4b1ef3a037eda0a671e33bd1c8fbde438f73e140752cde720d3d46f2a6843ca976ca2427a374185295809593157ab24bd2a649b
+EBUILD subversion-1.13.0-r1.ebuild 15768 BLAKE2B e205315b5b89c3e153d0ab3edb222158b574e95cf071d0e272d5e90674de10a7252e7fbb55952a3a051661ef50c528547d6a7bae4029306e7727e2f8ae70719a SHA512 64b2556e29730aa613626a73f18246adc7deead0534fd3763e00bee87d0330cd0e5f315f061987656277f0da162d4ac6227fa612c794c15f9b5478886e0c28e5
 MISC metadata.xml 770 BLAKE2B 3fc171f38c8332b6ebf65452866062a0c1e9e0019f5b84e5a61da936396641fac71a96d2c06c3179fb9545df163a8888c8460034284089076e3c1f7c281ef0bb SHA512 0ad45cbda96545bf72ff456f1b7c4d295580bead15e37c8861a571769731623ecca00f4a18b565cdd3c370d3e2ded68854bdf0fca3229434584c8ab340be90ff
diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
index 7a7ef56db37b..d64fcb558153 100644
--- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 RESTRICT="!test? ( test )"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 9bdd44ac4406..c403f7bdc870 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index fd12245bb460..2e2ac85ead6f 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -27,7 +27,7 @@ esac
 # @DESCRIPTION:
 # List of versions to reverse sort POSTGRES_COMPAT slots
 
-_POSTGRES_ALL_VERSIONS=( 13 12 11 10 9.6 9.5 9.4 9.3 9.2 )
+_POSTGRES_ALL_VERSIONS=( 9999 13 12 11 10 9.6 9.5 9.4 9.3 9.2 )
 
 
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index a8575c1d147c..30cbb226fee7 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 17b5d2823cba..d34754b86177 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -2,9 +2,8 @@ AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f25
 AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
 AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
 AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
-AUX supertux-0.6.2_rc1-boost-1.73.patch 613 BLAKE2B 1eafd4033ecd9ae48c8486572062021bce26beddf83bf6d9a83084d04abe47f6b3bd87134112ef8039f8fd97733c7fe18d0d17e8980b07ed683a850110722e35 SHA512 d7a389fe530da2c7a42210cd25331e18952b2c5260e777e39efe6efe797f27c9eac5a120351db8a7ee275079e832b9822ae3ecd10650030f0f8bb1852cf4c8e5
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
-DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4 SHA512 cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113
+DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
 EBUILD supertux-0.6.1.1.ebuild 1358 BLAKE2B 210189a07f9766cb6fd3f51f07a595dbbde42e55537c1dc6b954b62bb55fa7a36d5b9d7dc34196c6a69559c78d8eea03f17ef798332bdc0945653de4194e3052 SHA512 b7c0107970b68e011a678b63fae9fc827a6c7a6391575cf241c2e74550f065312adfbefd6684e0ad6584566764a16d9060ab9b089aed074024bcbfc7b44693fd
-EBUILD supertux-0.6.2_rc1.ebuild 1435 BLAKE2B 2b36b593476910d5a82946299451486f138da99341acb1b32ccf764a2e7a6659867a51d41baf26319952a15c853b7c3242202d8a580e5390d1a9edc36fbb1907 SHA512 b73be27696a4112ccabbccccfe2d1d14f78c95ecc995756b17a767ba0de5f177b1871463a385c6db878d951e64b5072c6b36d912c22ed541fb5e96ccd0326735
+EBUILD supertux-0.6.2.ebuild 1387 BLAKE2B e54a9a72c33f7d952e1b393c3582f2057e61197280154b3b8c77a77976b581322608527b7171f16aae4f75423d184f3eb9835ac4741ebc6f1919915b93d76748 SHA512 c38a3a3467eb797570a54485ff8f00713a79d5c994dc519d3acd0149587c2fc94a48a703ef5b3479fa3f2cbc44a8380d6efe8c9d4dfcca972c3cbb0385c36239
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
deleted file mode 100644
index 55fa95b70fb4..000000000000
--- a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 9 May 2020 03:04:02 +0200
-Subject: [PATCH] Fix build with boost-1.73
-
----
- src/editor/object_settings.hpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
-index bc9049a94..15b77b1e4 100644
---- a/src/editor/object_settings.hpp
-+++ b/src/editor/object_settings.hpp
-@@ -22,6 +22,8 @@
- 
- #include "editor/object_option.hpp"
- 
-+#include <algorithm>
-+
- class Color;
- enum class Direction;
- enum class WalkMode;
--- 
-2.26.2
-
diff --git a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild b/games-arcade/supertux/supertux-0.6.2.ebuild
similarity index 96%
rename from games-arcade/supertux/supertux-0.6.2_rc1.ebuild
rename to games-arcade/supertux/supertux-0.6.2.ebuild
index be67a6a7509f..a107f3e14c29 100644
--- a/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2.ebuild
@@ -35,7 +35,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
 	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-	"${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
 )
 
 src_prepare() {
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b7d1fc5abd15..6193d98f1d03 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 8587ed056b4b..8c72d47d9e59 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,4 +1,5 @@
+AUX colobot-0.1.12-includes.patch 690 BLAKE2B ab99d982dc57d4dddadae54faf6170268bab72ca4011b79fdc12e6197eec74209080a48f49e22d77c6b532d1e32e44d9cd2b62b225e02e78ac12586c23553eef SHA512 cb0c3eab9c5afab5e2ac8d3d10fc19fcb478a8dfa17d5231e33bbd4d322b375e028825daf739fa0cbeb9de95e04c2d4627a6d9e3f2740c54968903a497f11700
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
-EBUILD colobot-0.1.12.ebuild 1478 BLAKE2B a66d5c4aa584706868cfa8f76a368f6c614f48767a086946eafad83a44ae44d3c24a70650f4aa88971998495b70ff1122d02fded40193eda6f8fe07fb7de4080 SHA512 fcb8e33bccbf67cb835732630f1b84009202cce3a02dd7a497050f8fd91c3cb4ae54f62e3b24c62e1aa2687a4067aeced47cea1c7f5fe15a7707c451478bda83
+EBUILD colobot-0.1.12.ebuild 1574 BLAKE2B e75725e8752fe5daf1be82f6075dfc7c892a827eab53f5efed756572896635346303b856b644ee2767928f7b483e16d30917746ba146ce101330777e6c6982d0 SHA512 b4291c83da1895b78f13a3a6bedacb4a990337db6c1b489abb11436ab4ae64f331836fc41307ed303573b8dfef4fead127d71dda6694d76a0bd60ee6ddab81fd
 EBUILD colobot-9999.ebuild 1422 BLAKE2B 3c0d22a6df76aa3303567bff0b42c0e52aa765b0ec7e1dc6822125a949fcf94b89bc5957778e3aa2553a36c316105d96edcd9351629bb809b2a6187967ef1391 SHA512 791b6935cedfd32412d2fabf75cc388d7cc21bdd17262b713efbce5c1627e72fa78e152d305cc4b7aa59cdbed5b94f124b4a0e6cc7df6aa9081f3c2c9fa645de
 MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 1611ef4a1d61..7f53954e4017 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
+PATCHES=(
+	# https://github.com/colobot/colobot/pull/1300
+	"${FILESDIR}"/${P}-includes.patch
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
new file mode 100644
index 000000000000..1fb3a2730c44
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
@@ -0,0 +1,23 @@
+From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 14 May 2020 10:35:01 +0200
+Subject: [PATCH] Fix missing <limits> include
+
+Add missing <limits> include for std::numeric_limits.  This fixes
+build failure after boost stopped implicitly including it for us.
+---
+ src/script/script.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/script/script.h b/src/script/script.h
+index bc64dc232..dd4e02ff4 100644
+--- a/src/script/script.h
++++ b/src/script/script.h
+@@ -27,6 +27,7 @@
+ #include "CBot/CBot.h"
+ 
+ #include <memory>
++#include <limits>
+ #include <string>
+ #include <boost/optional.hpp>
+ 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8b2a52c812bf..9ba5557a6569 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 0d842a193ea1..98958bb7b3e1 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,8 +1,11 @@
 AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
+AUX gnome-shell-extension-gsconnect-33-avoid-repetitions.patch 1822 BLAKE2B b8e882b30fe642ac9b4b99dabdbceff3ac45f44ca988f06f42e7509ed150fb304a813b00275cb63f61af78096b8e44e751ccfff201cdb6ed9ca7c10690e4bba1 SHA512 a2be4ed1cebf339b98fbc7c84bb44da20fccac36f7a2ef09a3986baf8a7a177462f544579a1d0b967880915284dbe26d0b108a48e0a4d49fea4de290983642d0
 AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12054a8465dfdef3fdc52f4b20b66e1607c9df0f429636e4e296a7fe473f761abd717c6f7a0be6ea0f29df1a3c66bf4f24b7b0840f1097f2b7ba3885b46559e8 SHA512 d55a3a389da36f65b435287b0571f3ab3ee661ef892c45b27f3f9d30aeec69b01f9fb2c182e8272d62a1db7df5dea46650d3cf2e094d2df0f5f9b480e0ca93ba
+AUX gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch 1317 BLAKE2B 3972f38098ead8409a5a27f2c3a5fee28ed7923d551e16827a5b65bf1b02393179312e5c5494e5d7104ea7fff50aec096e41dd7010197b2e779ff113fb7167f3 SHA512 c6262256c971826e7aa56bbddca72f3a1731a3b70e472b0c64901c834f4787e26c10d2ed177df6f4901e4b5524c1a80494bde0a5bfdc5c94e8ede9ae686037d7
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
 DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
 EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1664 BLAKE2B bddb769e769f33c01755b4eeccf9e7765e525a9467c49b6ea9c14cff293305ab20f342b44acf4a4e1f159e7814d519b7ef522743714b3fa48f5fd556411f8ca4 SHA512 af81ce708d1fe19d409ccf64ef40b6acdcd02c76607565b3bfee7f097480eeedc159c58d10de4b6a8639abfb03ec19bd6ab9ccc91229afadad7f4ad7bd73732e
+EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1844 BLAKE2B aaba98359ff79fd1cc1ec936b1cc428d245231458c0dce6bebcfb5e880d30358241d7e750569286c6af70d4d245e66af4afe36da5bc16e25d1a28250420607f5 SHA512 47c0d2c17d96dc6256e633278cfe295cde4c0e65a6940939aeed3a47909f221c00220c3905825e741bdc369cb07d74bdb8082c164837fd844a1d9c5a2eb2df04
 EBUILD gnome-shell-extension-gsconnect-33.ebuild 1536 BLAKE2B c00fffeed8cd0ac7444cc1dcb4629742da2327b058c6be3d4c9183793abeccbce7e2a6ea5aeb82053fe65b828ccd32084eb544cc496f723c9145d3c91240391c SHA512 4d9ae97e9949ea93a2fddb48184a3c5d015b3e39076ad2241c196f7f662c2b05de5017ccf761d4fbeb13ebec1b953fb540f35187e874e520cdd44e3970d38376
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
new file mode 100644
index 000000000000..d7ed8780ee0b
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
@@ -0,0 +1,51 @@
+--- a/src/shell/notification.js.orig	2020-05-14 13:57:38.781404129 +0200
++++ b/src/shell/notification.js	2020-05-14 13:57:54.335642763 +0200
+@@ -200,20 +200,27 @@
+         this._notificationPending = true;
+         let notification = this._notifications[localId];
+ 
+-        // Check if @notificationParams represents an exact repeat
+-        let repeat = (
+-            notification &&
+-            notification.title === notificationParams.title.unpack() &&
+-            notification.bannerBodyText === notificationParams.body.unpack()
+-        );
+-
+-        // If it's a repeat, we still update the metadata
+-        if (repeat) {
+-            notification.deviceId = deviceId;
+-            notification.remoteId = remoteId;
++        // Check if this is a repeat
++        if (notification) {
+             notification.requestReplyId = requestReplyId;
+ 
+-        // Device Notification
++        // Bail early If @notificationParams represents an exact repeat
++        let title = notificationParams.title.unpack();
++        let body = notificationParams.body ?
++
++        notificationParams.body.unpack() :
++        null;
++
++        if (notification.title === title &&
++            notification.bannerBodyText === body) {
++            this._notificationPending = false;
++            return;
++        }
++
++        notification.title = title;
++        notification.bannerBodyText = body;
++
++       // Device Notification
+         } else if (idMatch) {
+             notification = new NotificationDaemon.GtkNotificationDaemonNotification(this, notificationParams);
+ 
+@@ -237,7 +244,7 @@
+             this._notifications[localId] = notification;
+         }
+ 
+-        if (showBanner && !repeat)
++        if (showBanner)
+             this.notify(notification);
+         else
+             this.pushNotification(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
new file mode 100644
index 000000000000..7301bfe11321
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
@@ -0,0 +1,34 @@
+From 959799d934360f95a2e49223b64ffc77bba2736e Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Fri, 8 May 2020 21:26:19 -0700
+Subject: [PATCH] Shell Notifications: account for apps that insert newlines in
+ IDs
+
+We need to account for the totally reasonable practice of inserting
+literal newline characters in notification IDs, like WhatsApp does.
+
+Not doing so was resulting in such notifications failing to match as
+device notifications, allowing them to be duplicated in the message tray
+
+closes #788
+---
+ src/shell/notification.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shell/notification.js b/src/shell/notification.js
+index e7a5f67ce..eef623a71 100644
+--- a/src/shell/notification.js
++++ b/src/shell/notification.js
+@@ -16,10 +16,10 @@ const APP_PATH = '/org/gnome/Shell/Extensions/GSConnect';
+ 
+ 
+ // deviceId Pattern (<device-id>|<remote-id>)
+-const DEVICE_REGEX = /^([^|]+)\|(.+)$/;
++const DEVICE_REGEX = /^([^|]+)\|([\s\S]+)$/;
+ 
+ // requestReplyId Pattern (<device-id>|<remote-id>)|<reply-id>)
+-const REPLY_REGEX = /^([^|]+)\|(.+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
++const REPLY_REGEX = /^([^|]+)\|([\s\S]+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
+ 
+ 
+ /**
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
new file mode 100644
index 000000000000..5b9bc72ccdc8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	=gnome-base/gnome-shell-3.34*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+PATCHES=(
+	# From 'master'
+	# Shell Notifications: set a limit of 10 notifications from GSConnect
+	"${FILESDIR}/${P}-notifications-limit.patch"
+
+	# Don't show duplicated WhatsApp notifications and avoid repetitions
+	"${FILESDIR}/${P}-whatsapp-duplicates.patch"
+	"${FILESDIR}/${P}-avoid-repetitions.patch"
+)
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	meson_src_configure \
+		-Dnemo=false \
+		$(meson_use nautilus)
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 6b60e0e03b5e..746d6cfef618 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 44a6ba944499..7abfc9c81a2e 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,6 @@
+AUX messagelib-20.04.0-qt-5.15.patch 1480 BLAKE2B c0c2535178fdd111ea4b2a65700f7a489b23aae47bb8eaa5dc5820a4749292a77fa9fe6ee0632d678a01fe0507637e4b514c210a6e2007c4512c76669c960129 SHA512 b077b55adfab62abf10d433b7defb0ac315226e72b8b1dc6303f901d1ecd6a4e6f32bff1268ca02a00f6657af6f9a57654cecd15c1fe5d804161bea09160732b
 DIST messagelib-19.12.3.tar.xz 10462112 BLAKE2B c40e7eff15822287035bd3ea72d3df703803b67085a76b74d4f4eebde581de03af6da23f7cbe9ded08de5f2f0a442c2721c37ff4ddf51fc8f1e2b966dec3bb4d SHA512 d0f8c018b819a678543b42149d73bacde35461bf8fd42c7e4a7d46796a158ae665cc164d65508fb7a744ba2b2035417ce1f2daa758ffa4d0b8b8b860803d8ed9
 DIST messagelib-20.04.0.tar.xz 10494552 BLAKE2B 3d0822a7407d1e7e92d7a2b18dbc6caf418f56dd3bc22c8a1d8dab4358a72c04f62a8fd648ed2d641d1f32822a47a190e048e1794e5b712a2cf1f7f9877d58bc SHA512 1487f7bd8bf61525b841471b245cda8bf4704c7206c347dc00fdd38569e1711338d3c013baafa304f74786560b496a10a1b15ed268b9263a69c06deaa9c2d7e1
 EBUILD messagelib-19.12.3.ebuild 2126 BLAKE2B 90cf237b87a7aa526deb19bdebe43c8329d9601f61ad79d6d98baf48beb8d8ba274a02c67959c649772352d727f1c2775dd642ed2d4936e260c88cdaf30d034a SHA512 e07bac71e92a98ea17fac4824d7fdb2fadeb52c54f3d0b045f0d0431673d432dba259dce383b66f248e75b767be9f85bee0696c303816c865e732357d5f99385
-EBUILD messagelib-20.04.0.ebuild 2137 BLAKE2B 4532c72a0caece041d0ad0b6c423075427eb5e2681876a7e767d93f0df88ce76ad1ae37ec92b46a75c19ebc42a2611f0fc2e8394d13c4261cec39ad119bc9d28 SHA512 ebba1786404848d58735322b07861285eb7cfd3d709fb3cc8e43ca1e97f241ffd40036b674b70a8d5874ae2c1d8b9c42b7bb5a2e1586026b9157ce2528882f18
+EBUILD messagelib-20.04.0-r1.ebuild 2183 BLAKE2B cec804cd14278174207d4c25bff218a62ab890852a340db608eab70f52f6d3526ac8b4fdfa33a45a942e84945c1dd753e1f3d96887928bf6b1017dc60909d127 SHA512 49a61a44db2d92e938659af6de89da4500f68e699749108f73a027eeee628d617d47069c7d5c9956170e78fcb1cc32a25ef1d39f1f6f08036181a94862a35560
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
new file mode 100644
index 000000000000..93f632bdc690
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
@@ -0,0 +1,25 @@
+From 1f2548805df60707ffba2bba27d35d441232d140 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 14 May 2020 13:27:14 +0200
+Subject: Fix load header with qt5.15
+
+---
+ messageviewer/src/viewer/webengine/mailwebenginepage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+index b9d7b9f..f1c3eab 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+@@ -40,7 +40,8 @@ void MailWebEnginePage::initialize()
+     settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::XSSAuditingEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, enableElement);
+-    settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
++    //We need to activate it in qt5.15 otherwise we can't load local css file and co
++    //settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
+     settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, enableElement);
+     settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, enableElement);
+-- 
+cgit v1.1
diff --git a/kde-apps/messagelib/messagelib-20.04.0.ebuild b/kde-apps/messagelib/messagelib-20.04.0-r1.ebuild
similarity index 97%
rename from kde-apps/messagelib/messagelib-20.04.0.ebuild
rename to kde-apps/messagelib/messagelib-20.04.0-r1.ebuild
index b876fc9fcfd0..f6471d93ddb2 100644
--- a/kde-apps/messagelib/messagelib-20.04.0.ebuild
+++ b/kde-apps/messagelib/messagelib-20.04.0-r1.ebuild
@@ -69,3 +69,5 @@ RDEPEND="${DEPEND}"
 
 # bug 579630
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 3073de4306d1..d39e5ab29830 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 2a97c346a0b9..30f4d9b3d4c2 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,7 @@
 AUX kio-5.67.0-memleak.patch 1461 BLAKE2B d891dd6e0012e23ac76216ad7f569215bcb17b2283e1e6dfc66ced2633fcbc41eae7830a3f670c8605396387c59b2338b2628f9919dbbeaeb557bea864b40931 SHA512 8dcff03fcd915c1adff16976839fc85b9e2ce6cf509aae29a93b4f385e8af0dad241360c87413943d5755c72de2b4c2da5423d35dc4be84dcc61756502abe407
+AUX kio-5.70.0-fix-run-in-terminal.patch 4162 BLAKE2B 5fb81c0bce45dc22a8dea27b81e962e267f000aa224fa7ce2dfbf3dd01bb9cd90a73623482a1580a1b95de91e3d40a157988dc3123b3e1a942827ded77174588 SHA512 64b068ea2bc9eca10f8144bcace49989c75ab64d4991b12d4720421464e3c372c5a95d56d510f68d84424e4071e2b2ec9bc447fc30e5e3c9189ccd6156d56738
 DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04 SHA512 baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72
 DIST kio-5.70.0.tar.xz 3200704 BLAKE2B 23540865ab0310fb3564cfcc445602aab46c8cdbc3b1d40e9428e13a46f9e3795a1fca853028226cb9e3313ef3d22a5347a9cfc9b058e1959bf4dbf861b0792f SHA512 80e8e8bcd49c09228c9a439f97aecca784880b852eeb82c84ec44868de44d2b0c5a63a4d220e6c2f2c264b7e87fe0d5b639f652b1f50c9fe1b1b941b366d929a
 EBUILD kio-5.67.0-r1.ebuild 2461 BLAKE2B 72ea49e11d92138ac43f4470c1f63f2f44539af50983b5734994c5418c1c75c2c9b7ea9612e73362241f41c5a63aa706963fd0b6026947724b5c2d741d2ba8cc SHA512 6718d9abf8b53bf3ddd7132d9567e21bb92e6c12abfe1b3a8bc3f8d37f0f79d0d01f6a70d35d523e04621ea8ccb79668601b0316497aed1bf0040f9ec8a78e66
-EBUILD kio-5.70.0.ebuild 2395 BLAKE2B edc842f9980dcbf982627142bda4c7de8aa1ce522e429a7df89c99cdeda7b221bf6837e5f4a3c82a2b26654b3af0cee5d1cb536a7d67286440e8be4b1f73eb8d SHA512 7786c3063d373d062e8c7a25f0b17145d96b3d19f787738f227b4c756beaa8d93afc31ddc90ee5c7423b7fe66b1030e900d1f21968b9cf741c15f2b6ca0106a9
+EBUILD kio-5.70.0-r1.ebuild 2453 BLAKE2B 6fa330d5b0acb83b25db7e9550d81b5110a44ad5607b75529ac77c58233c1235ac92075cc8fe0e1a4ea800f34533b55116912fed25562e51f09092ed98951781 SHA512 afc6756395e4b4d0e1ebf53a85cdbb1e0358dcea65dfe92b22ee7770b51d51720afd613633096f234e2146bac953ea045bfbffd33b85ca19ed6ae3646ec2e573
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
new file mode 100644
index 000000000000..4b9b8bf58179
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
@@ -0,0 +1,89 @@
+From 6452a34cf01d03d3167b38bc28a2fe8e13569021 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Thu, 14 May 2020 19:17:54 +0100
+Subject: Fix service file specifying 'Run in terminal' giving an error code
+ 100
+
+Happens because KIO::DesktopExecParser::resultingArguments() prepends
+the terminal application to the command line.  If this is a relative path,
+as it is most likely to be (and will be in the default 'konsole' case),
+the "realExecutable" check in KProcessRunner::KProcessRunner() is triggered
+and the job aborts with an error.
+
+Expand the specified terminal executable into a full path in resultingArguments(),
+and return an error immediately if it cannot be found.  This full terminal path
+is not relative for the KProcessRunner::KProcessRunner() check and does not fail.
+
+Check that resultingArguments() is not empty (an error return) before accessing
+the first word of the command, so that it does not assert if the list is empty.
+Also only call resultingArguments() once.
+
+BUG: 421374
+FIXED-IN: 5.71
+
+Differential Revision: https://phabricator.kde.org/D29738
+---
+ src/core/desktopexecparser.cpp | 10 +++++++++-
+ src/gui/kprocessrunner.cpp     | 17 +++++++++--------
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/desktopexecparser.cpp b/src/core/desktopexecparser.cpp
+index a3b5219..fcf83d9 100644
+--- a/src/core/desktopexecparser.cpp
++++ b/src/core/desktopexecparser.cpp
+@@ -421,7 +421,15 @@ QStringList KIO::DesktopExecParser::resultingArguments() const
+     if (d->service.terminal()) {
+         KConfigGroup cg(KSharedConfig::openConfig(), "General");
+         QString terminal = cg.readPathEntry("TerminalApplication", QStringLiteral("konsole"));
+-        if (terminal == QLatin1String("konsole")) {
++        const bool isKonsole = (terminal == QLatin1String("konsole"));
++
++        QString terminalPath = QStandardPaths::findExecutable(terminal);
++        if (terminalPath.isEmpty()) {
++            qCWarning(KIO_CORE) << "Terminal" << terminal << "not found, service" << d->service.name();
++            return QStringList();
++        }
++        terminal = terminalPath;
++        if (isKonsole) {
+             if (!d->service.workingDirectory().isEmpty()) {
+                 terminal += QLatin1String(" --workdir ") + KShell::quoteArg(d->service.workingDirectory());
+             }
+diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
+index a4701a7..cc57b54 100644
+--- a/src/gui/kprocessrunner.cpp
++++ b/src/gui/kprocessrunner.cpp
+@@ -88,9 +88,17 @@ KProcessRunner::KProcessRunner(const KService::Ptr &service, const QList<QUrl> &
+         emitDelayedError(i18n("The desktop entry file\n%1\nis not valid.", service->entryPath()));
+         return;
+     }
++
+     KIO::DesktopExecParser execParser(*service, urls);
++    execParser.setUrlsAreTempFiles(flags & KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
++    execParser.setSuggestedFileName(suggestedFileName);
++    const QStringList args = execParser.resultingArguments();
++    if (args.isEmpty()) {
++        emitDelayedError(i18n("Error processing Exec field in %1", service->entryPath()));
++        return;
++    }
+ 
+-    const QString realExecutable = execParser.resultingArguments().at(0);
++    const QString realExecutable = args.at(0);
+     // realExecutable is a full path if DesktopExecParser was able to locate it. Otherwise it's still relative, which is a bad sign.
+     if (QDir::isRelativePath(realExecutable) || !QFileInfo(realExecutable).isExecutable()) {
+         // Does it really not exist, or is it non-executable? (bug #415567)
+@@ -103,13 +111,6 @@ KProcessRunner::KProcessRunner(const KService::Ptr &service, const QList<QUrl> &
+         return;
+     }
+ 
+-    execParser.setUrlsAreTempFiles(flags & KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
+-    execParser.setSuggestedFileName(suggestedFileName);
+-    const QStringList args = execParser.resultingArguments();
+-    if (args.isEmpty()) {
+-        emitDelayedError(i18n("Error processing Exec field in %1", service->entryPath()));
+-        return;
+-    }
+     //qDebug() << "KProcess args=" << args;
+     *m_process << args;
+ 
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.70.0.ebuild b/kde-frameworks/kio/kio-5.70.0-r1.ebuild
similarity index 97%
rename from kde-frameworks/kio/kio-5.70.0.ebuild
rename to kde-frameworks/kio/kio-5.70.0-r1.ebuild
index 52bbb2edc065..c95390be6b2e 100644
--- a/kde-frameworks/kio/kio-5.70.0.ebuild
+++ b/kde-frameworks/kio/kio-5.70.0-r1.ebuild
@@ -71,6 +71,8 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-run-in-terminal.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package acl ACL)
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 3a6ea4bab42c..56eb7b6509fe 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,7 @@
 AUX plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch 966 BLAKE2B c3124a608ba4d98c72fae39a1e934fbb5cfdaca3c9ae6c007aa543cfd6d5d8e1df75252e58e86b4ba41088199f20e5225c5beb891670b8c2ee06dd7fed7f766a SHA512 daad08bcfdcad504f8e51290992d1d065e043af35624f02b24caedda4ee4c1d06f399f94edd3ec214e3a5f8f6e631c2ea0a7faf1843c7aa6678fe0aa6c8743fb
 AUX plasma-5.67.0-remove-hardcoded-colors.patch 7414 BLAKE2B e56f7055afa03767cecebd9954158d74cb97b837dd474f2f710b4e00548f5bf64cc3571aa22802ade239ab6794030760e4f223c14a3011d93f46783c4dac34f5 SHA512 cb3bc11054231344678ffbe629b5c4cf76d098ab05e932b340870d705d61cd6725425463bbaf4276040c24c1058e237643977c68d62f78848c2bb0510f4addb2
 DIST plasma-framework-5.67.0.tar.xz 3127592 BLAKE2B 15eabb6b3c62117ee64a8ceb2c6cee9d1df29942785b5e0e061f062e4ddc5cedb0ea73ea17e597bb09a5eef868cb8aafe81a25d51af19691f05152d05b916f8d SHA512 3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92
-DIST plasma-framework-5.70.0.tar.xz 3132240 BLAKE2B 33d4a13be75839a4fa29c767679585debfe928084975febc3b5924b96bb5d03638ac96669fb92d293e5536d2226f4d4759663687f3e8a1e22f64874285a8e1ed SHA512 c11f6169f57ade39e6d6f44a7cfd462ce84f09cd6f05ae765224a33fbd491dcf232d51e73b0c2e406f89b39b59e7edcfecb479a02ddaa94d920600bd6122e46a
+DIST plasma-framework-5.70.1.tar.xz 3132736 BLAKE2B 6f6dc34c6e9f5c433e2a6302fffc7172a7dbf187cc8ebeef1a5c47dc3b329269d71891508e41c3b0a7a7d8de8af519d7a9c320defec6726e9fdf9b859d158017 SHA512 2b022f0e1e6abec8b7cf0ff77dd862a78f17692d17a78ad5a42a1a784c98a57070a5a721b44e808e299f374248769b90449201ae3c6dba17a292726e3b646930
 EBUILD plasma-5.67.0-r3.ebuild 2091 BLAKE2B f54d8025715f9820f8fc8fb32e50fca3c7c945391ea8ac3b27e6db5f23708e7b453ce582388a77991ed455ddbc0957e992b631445a06ada00f5064ac054254ec SHA512 81a9dc4a48d6d634dabee6641a732f99844bf38d6667a3fff070bd7a521e4b7a22968ed7e574893c653e2652002dd38a036a719563f5bed05f4e773c6d53de53
-EBUILD plasma-5.70.0.ebuild 1930 BLAKE2B b394277d5f614c5a7aa3d5f56aa26bb2d574b1140e7c58f879fd1f5bb7950229588922a6e2875a242a9bcd9132e99f77f1380fb1f3de5eff76ae3b2b29db25e4 SHA512 3ad4bfe0936337f683ac315ed09970af196e3c8be54183d0dba3917e336b0792d9b620de377f7b006073ed65a6b99c864da9550491b1e9aaac711a9cb87d30c8
+EBUILD plasma-5.70.1.ebuild 1930 BLAKE2B b394277d5f614c5a7aa3d5f56aa26bb2d574b1140e7c58f879fd1f5bb7950229588922a6e2875a242a9bcd9132e99f77f1380fb1f3de5eff76ae3b2b29db25e4 SHA512 3ad4bfe0936337f683ac315ed09970af196e3c8be54183d0dba3917e336b0792d9b620de377f7b006073ed65a6b99c864da9550491b1e9aaac711a9cb87d30c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.70.0.ebuild b/kde-frameworks/plasma/plasma-5.70.1.ebuild
similarity index 100%
rename from kde-frameworks/plasma/plasma-5.70.0.ebuild
rename to kde-frameworks/plasma/plasma-5.70.1.ebuild
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 0e7949d44569..46a987d919a4 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index c5b95d952adf..ae3db769f4a9 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -2,6 +2,6 @@ AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e1
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.17.5.tar.xz 1343896 BLAKE2B 0db47b3ed5f937c7701b52b194be71c6ccf474d5a1ede18864f32b1e374972cbd2e15f26b99f30fe4feba6adb153d87a05c5ccc5feb2bdd36ccc4086eda6f688 SHA512 4f759cc614061e128d57dbbcaa3253fdcda3ab96f3149085c320a0fe826f93b19a35c4b642e5ae9726c0e049ea7a4f8b6490575aeefb22b57b2c4ad8c0f1cbf7
 DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
-EBUILD kinfocenter-5.17.5-r1.ebuild 2769 BLAKE2B 8bdb3907e0620d00329b0f1c446c909977b47fecb80d459f83e136de327b8b62292d005fa3d5d7b8c44074fb098c5f863fd2b5bc8d08c8b7ba79f870ad2d5caf SHA512 848d3dfdb146c0b40b616452656b3bab334e4ee0d1dad9ff9fa7198a492b46c3c79053d393062f3675d0de192bac0c7624a98e3cdfaecd01bcfd3bf86c4825cf
-EBUILD kinfocenter-5.18.5.ebuild 2835 BLAKE2B 01a7897d23f03e6cd8c40792ca8014a155487238f88fdad4dcd2d408935cd587fd63eda2718c7616b18b1db7af73af81a42785816a4221c37aa27a3e2eb39f21 SHA512 8fe599ec4e8c2315c30950eb2d9635048c3cfc9d34bf34ef6803b8ea5ab41145f279a54c908c8baa6355e32c677675a7b4cc2e6ead02aa4d2ff8b10c358969d7
+EBUILD kinfocenter-5.17.5-r1.ebuild 2774 BLAKE2B b37297c3e770cfc6343d7783213dec052073bb81a50e760b926de14194616192bfded78b573d720c9da5b70a41518e5ce7bafd23118b96aab76a12157d066c4b SHA512 f0e97080c3555e06122aa2bff3f412258877674b1a556ee383ac2058fedf6cb5d527db280176c72e66935cfac122e025e23fedda6197e682f726f4b5b7ad2355
+EBUILD kinfocenter-5.18.5.ebuild 2840 BLAKE2B a7f5a6c1173aa291bfa0bc45177f1df6e6a7c7311f493b0ceeee6cf9502f21f6c2ed3057a61b101a95f5bdfe378671444eaf4b3f6ca9b88fb9e5ca02e7720bb1 SHA512 a27e1980460e91851ff3f047e9cdeffb88dbad0b74d1b124bf51036e960103d648eba5abd3a39b7d44b1324a1dc6699feaf3cad976b874f3e9077e1ded1305fc
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
index 3676aa32df22..aff078e79908 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 	)
 
 	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
 	else
 		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
 	fi
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
index 7ad414c34049..bcdac815889d 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
@@ -73,7 +73,7 @@ src_configure() {
 	)
 
 	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
 	else
 		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
 	fi
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 6db2e50ca0be..43108bddfb68 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index bb2818ee35e1..458afdb27dee 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,6 +1,7 @@
 AUX alpine-2.22-cc.patch 537 BLAKE2B 0f916be9bf91d8f9c347c9325d20a13e8ffdc462f050d0e7adc0f90b8371844bc615182a178fac145d95dfbe425c20e211606558e56158e2dc3723875df96c44 SHA512 ba694fc876b2ca32b0ff068e6153768fd117c0f9ea26d1fffb35a1640cd38882667d58c7678300917c17a23076e2a4cb0111992b4e42d07b22c2e328d69713e0
+AUX alpine-2.22-fno-common.patch 677 BLAKE2B c03b54ff8db4e8a4868144c3b6214e75153bf88af78380bc5334a94cac4c2aaf9404a3b6ba9cfb4ac662af2f911211703c5383c37138dfe0acc71c965e08c395 SHA512 cb1513c374ced36adfec51267a61cdb38c38ea0d3d81812a1eebdaf973f2aaabf74f8fde58920c4044d0f389898966335cae2f54505a8314e0f917fbe2786cab
 DIST alpine-2.22-chappa.patch.gz 173232 BLAKE2B ac2cfc22119c9e60fdc053212447fb5df8cc59781c049329560d21e19e67d700fe45a07649352747583b500a605499eeb61dfd83ba150c3bd58f4033486e2581 SHA512 9db36ebb4fb2efaee975ed33d44cf95780c56075cbc0ad39056268248db38109e1bb04e279b40cdd085b3dfec89d0f9c69aa4ddf5a64b5708437909661288e23
 DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1
-EBUILD alpine-2.22-r1.ebuild 2265 BLAKE2B ea1f4176eabe268c155e5914bb3a20cf743cd4c9507ed80c3863d58085228aea26d617979128135d3c534de5525fc5e72d23bca9bc699900cb3587121a2c7dea SHA512 182c3b98238b39bb3cfc7c5548d6192f4659468f972fc9d8234dc9cc088388397f848c2024360e279e5c529278f1e938feb5cd934edd280d0794af008933ec88
+EBUILD alpine-2.22-r1.ebuild 2302 BLAKE2B e1ec8c6c4b61912740518ee2366b74643110f04054a5eb00d8991cb2bd0f9789df09710d520548edece53989f9a440f006a500a5934b2df55cf63967af7b2804 SHA512 cb36c20a9c4f74a7f14b1f7dae7be4dcc1fae8bf1d64f0e77fcf956287f091dfd512a8c50dae8abc3f3363fa65d6dbfb17a40adce8825ceb2d1ddfac72da7296
 EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301
 MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae
diff --git a/mail-client/alpine/alpine-2.22-r1.ebuild b/mail-client/alpine/alpine-2.22-r1.ebuild
index 2d77170f9850..95787b03996c 100644
--- a/mail-client/alpine/alpine-2.22-r1.ebuild
+++ b/mail-client/alpine/alpine-2.22-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-cc.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
 )
 
 src_prepare() {
diff --git a/mail-client/alpine/files/alpine-2.22-fno-common.patch b/mail-client/alpine/files/alpine-2.22-fno-common.patch
new file mode 100644
index 000000000000..0ef289eb8cdd
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.22-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/pith/smkeys.c
++++ b/pith/smkeys.c
+@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
+ #include "../pith/util.h"
+ #include "../pith/mailindx.h"
+ #include "../pith/readfile.h"
++#include "../pith/options.h"
+ #include "smkeys.h"
+ 
+ #ifdef APPLEKEYCHAIN
+@@ -50,8 +51,6 @@ static int       mem_add_extra_cacerts(char *contents, X509_LOOKUP *lookup);
+ int		 compare_certs_by_name(const void *data1, const void *data2);
+ int		 password_policy_check(char *);
+ 
+-int  (*pith_smime_enter_password)(char *, char *, size_t);
+-
+ /* test if password passes a predetermined policy.
+  * return value: 0 - does not pass; 1 - it passes 
+  */
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f471300fa23a..64352ae9379a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,5 +5,5 @@ DIST mutt-1.14.0.tar.gz 5220515 BLAKE2B 4a9b70f0d32df1a33947898b71044a97b9cbca04
 DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
 DIST mutt-gentoo-1.14.0-patches-r0.tar.xz 31124 BLAKE2B e5703fb22d627cac2fd7ef9565c10a46ccd3153611335aa3051b1d38feb68b52fb0bd0a1360c02fa0723bedbdaa2b4000020546f3f5bf039b5e9578c6481cf6f SHA512 1c89d6843392ad9db869dce9c90a04cb712bf3c783797f231749fddee6047e5ec79513abca644e76e3f28c4af2e94f055ab72a794f4ba6a971d2f668c6b6a1ff
 EBUILD mutt-1.13.5.ebuild 8370 BLAKE2B 73455bc38f547ad43a1fcd3eeca0f7bb3841fd9c03d1e76a4e9d7871d62a0f7867b4a27f78d209dcca177dd0b20dc5c404939f74153ef0efb6b0560564cc6aef SHA512 a5e12b65007bb43fcf329617a512fb6bb268bdf365df322c7869bc075c03df8ee67e206160a488d73bd0b8d5b4e50f23c4d7409cf0e84ac3ac53d5bd339a10a3
-EBUILD mutt-1.14.0.ebuild 7848 BLAKE2B 52daf81e051eccea9e6f8ae17342761aa073888d3b474e5d07a9086067a84cd6bc67631dd9987fc8650fbcb2c9fb5732a684da67864ccae57a9166a0aba221c3 SHA512 7163aefa1dd76f11e66ce33a1ff9d1e3535c788541bb29b27da10b44565dd69c5b0c195ce37d44f9284a0795569b052a947fb3a1b5d5851663fbf94889b29351
-MISC metadata.xml 1236 BLAKE2B 7eeb325d387a51cc8dff5907cd925ade6f09e194ec1288246b56a89d3d2427e01f3c73c26d540c80b042a7523ea8b81193f0f47f5989b352fc1e841413b1cbb7 SHA512 203ce21bf943fde79521227b41f04e1b4dc44f0127fac33582037d62c8f07a6e85884dd095a4ca9da1a5b12b4743fdd8b645077500c0a0eee75fc2ca8066d4a9
+EBUILD mutt-1.14.0-r1.ebuild 8238 BLAKE2B df3056665c7828775ca8ff1cb9999a6aeb48a6218df128e07798a7c01c2672f5806f26b3c9869adb20af3d9ff4d48da422a59a118fba5b00a268588315abf03a SHA512 e7113be3b0f73c143b439fd6214734cd35af06a09bf6ed37596db9bc2b73913b7272b9b05c68364cd3e8dc00ac67d5ccb009dc7dd8793e251b81e580c39cf62e
+MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 6d9a60c2d6f6..f418ce80a681 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>grobian@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
 			for header caching</flag>
 		<flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
diff --git a/mail-client/mutt/mutt-1.14.0.ebuild b/mail-client/mutt/mutt-1.14.0-r1.ebuild
similarity index 92%
rename from mail-client/mutt/mutt-1.14.0.ebuild
rename to mail-client/mutt/mutt-1.14.0-r1.ebuild
index 45ba49cadf86..655ecdfe2af2 100644
--- a/mail-client/mutt/mutt-1.14.0.ebuild
+++ b/mail-client/mutt/mutt-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
 SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
 	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
 # hcache: allow multiple, bug #607360
 REQUIRED_USE="
 	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	smime-classic?    ( ssl !gnutls )
 	smtp?             ( ssl sasl )
 	sasl?             ( || ( imap pop smtp ) )
-	kerberos?         ( || ( imap pop smtp ) )"
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -52,6 +53,7 @@ CDEPEND="
 	kerberos?      ( virtual/krb5 )
 	idn?           ( net-dns/libidn2 )
 	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
 	slang?         ( sys-libs/slang )
 	!slang?        ( >=sys-libs/ncurses-5.2:0= )
 "
@@ -118,6 +120,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
 		$(use_enable pgp-classic pgp)
 		$(use_enable smime-classic smime)
 		$(use_enable gpgme)
@@ -215,7 +218,7 @@ src_install() {
 	} >> "${ED}"/etc/${PN}/Muttrc
 
 	# add setting to actually enable gpgme usage
-	if use gpgme ; then
+	if use gpgme || use autocrypt ; then
 		{
 		echo
 		echo "# this setting enables the gpgme backend (via USE=gpgme)"
@@ -225,6 +228,16 @@ src_install() {
 		} >> "${ED}"/etc/${PN}/Muttrc
 	fi
 
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
 	dosym ../mime.types /etc/${PN}/mime.types
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 5ed3ca362bd9..dccef9d3c759 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -11,7 +11,7 @@ DIST roundcubemail-1.4.2-complete.tar.gz 7006013 BLAKE2B f92b94de3ce58cd145ce3d3
 DIST roundcubemail-1.4.3-complete.tar.gz 7028284 BLAKE2B c53efbee437960339c6e80a1fd2affff8ae8dfebd886cf029fc081d16c7874f0b6ea7fa03edb54276384dbf9d3948d84a6869f97cf3ce6bf27c52d50ba76ca56 SHA512 c65359473d08a46dbd42894c2758a46209491fc421ee58ab5b1c0d0d56e3fec8b2f43d01b18cb8934589cbee7e7abfda2c8efbf02b3521790d7b45ed6dc88a1e
 DIST roundcubemail-1.4.4-complete.tar.gz 7029864 BLAKE2B 2a6764a65c29e3deac6275c3dfd19ab2bee1f33ae1a7767561fcac25688bb8f3f7eeaee3eece20d2a6210aff18a5e493d0be709f4a3ae2ad4f3cfd9a1b124f06 SHA512 ddea321b5266c547f67c010147e9aa1457bea4802bec37f9e9d87e691bdc8df27f5c90cff8770de2458822160b85f7359f62742072ae1d642a040b9d88651519
 EBUILD roundcube-1.3.10.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
-EBUILD roundcube-1.3.11.ebuild 2429 BLAKE2B 9fdc47f7c5b3ee223182c3d24a9c1963ae7a79eeb30d957025af96393db814f5c3a06d66e832900c3c323594c994d525da5403d43e20ae3c233afff6596fba3c SHA512 82b1241bb9c7d6571f872ebd5b164555659c89935566783e532663d6d397e76357f5d036d6f6f691657e0127449ce382dbd4f5983cbf2eaaaac5af5aa16f9d3f
+EBUILD roundcube-1.3.11.ebuild 2428 BLAKE2B cc70eb27f47971ef7e063f9ccc890a9b6e608b29e8826c183e6655a0013472d3e68556f74dea6b78383f2efb6118e1fb89a596b64423329830af4d9149530f40 SHA512 753502027267a756e87439270cf0aa5ed7ef646e5a85f12c7d810436cd3ae6df5634dc2d8254d84fcce493b3eb828a8e948d859ca50f23e4ad49f64f8e9676e9
 EBUILD roundcube-1.3.8.ebuild 2426 BLAKE2B 3028d0e6f300d6eaa7d1cda1ec854b2a3f1149dc5a56e29a89a4de71e3e4b1f2f8d927f5f89cc202e78dfa34d603f58430aee493c03c11cfb9edd7636503b298 SHA512 60d2e8bbf22312f9f81a6ade6628e7ed67ca771ba914e8045cabd2786941c13fb0b363575d6b2edfb9f847e92f255b0441535d12655f08588fd479611e2eca9a
 EBUILD roundcube-1.3.9.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.4.0.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
diff --git a/mail-client/roundcube/roundcube-1.3.11.ebuild b/mail-client/roundcube/roundcube-1.3.11.ebuild
index af45b42575c0..cb1c8e78a57c 100644
--- a/mail-client/roundcube/roundcube-1.3.11.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 
 IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b5cbc3b40256..cdfceaf53f84 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/exim-geoip/Manifest b/mail-filter/exim-geoip/Manifest
index 635bff341e42..e264306c3079 100644
--- a/mail-filter/exim-geoip/Manifest
+++ b/mail-filter/exim-geoip/Manifest
@@ -1,3 +1,3 @@
 DIST exim-geoipv6-dlfunc-0.1.tar.gz 306380 BLAKE2B ce51841c988f41e5dff9c545852985e94ed4ddcad7d4575d0001d39a67266ad1083b4bed8c49fafa8ac742e2c8d1a12f78585b29f5887ceecdd37c862bef8c7f SHA512 ab10cf8ccd89772c1b925115d45cbd429f9ad577b4b951b120162516f0702331b8f8cca780d4aa1714435a907deed52f50acb06e9be888136a1745834d73215e
-EBUILD exim-geoip-0.1.ebuild 626 BLAKE2B 3f6839ca14c0adfadb9b522697baf7ecc5fea9f6653d32ed4ff61b7e75c15ed4230b22695253b59fcf1f189b9e314abacc93732b7275c98e19f2c423e3364833 SHA512 d747e18c3811f0abc183d5d24af3e1c363c2cf180b427076977521e73a08945e49a5734ae91aceb0d8981ea19fb7e6d4de0afdcdfc3b7eb689698bc639d3619d
+EBUILD exim-geoip-0.1-r1.ebuild 640 BLAKE2B 6e1b5edee70176486b758abaee62fc49798dfcf99e55f43244c1e0c301c857df6aeb6e36ee01d1fac65497ab6867c887fae96b96ddeb6150e690220df03fe460 SHA512 3f4f3c077bddb2c046c8671793b9307e849af632755577479b7807e9dcc8af31453a8c229d37c9a8c9c0e1d22e201e6b8aec16ca44d35db9445953997e03afb7
 MISC metadata.xml 563 BLAKE2B 04a42876b10c10bb1e4941b0371a9e361023d48e12df440ec20cfdf3d641d830e1cb86e9ecb5c1bf07d1c5ab8bc574c3ec6fac51c11184ee63393583b9c66ada SHA512 62706fd3f95ae73470d26133ff28fe53011d4aa8268822218a69203a95de8b7474da67d8875c4f47953ab614d036a884254f714157f6aa31bbedec167372514b
diff --git a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
similarity index 91%
rename from mail-filter/exim-geoip/exim-geoip-0.1.ebuild
rename to mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
index a2f6fdee4d5b..589d796149ff 100644
--- a/mail-filter/exim-geoip/exim-geoip-0.1.ebuild
+++ b/mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/exim-geoipv6-dlfunc-${PV}"
 
 src_configure() {
-	append-cppflags "-I/usr/include/exim"
+	append-cppflags "-I/usr/include/exim -DDLFUNC_IMPL"
 	econf
 }
 
diff --git a/mail-filter/exim-p0f/Manifest b/mail-filter/exim-p0f/Manifest
index 2b3dc6949711..ef6142002242 100644
--- a/mail-filter/exim-p0f/Manifest
+++ b/mail-filter/exim-p0f/Manifest
@@ -1,3 +1,3 @@
 DIST exim-p0f3-dlfunc-0.1.tar.gz 307851 BLAKE2B 73bb80220ed65fadb17079b1e566664b51bea95ee12636296054b4bc8e3902d518ab1e63511d49c14f56e5ccb257ac10987fe8fd399c6e33c2f733a94f8f71df SHA512 9f913ba303bb42f6599ed044bb65954f993c2964d84ea0ff4e01e515c35ac7b58118fa6a304cba984499136438ad8f65bfe8c08e22c3be2d4c95f2950ab380b2
-EBUILD exim-p0f-0.1.ebuild 617 BLAKE2B 00c6b51a9fb865fb54992cd625b57af9c43af04330a27076c1d0964420e9694dc67e9cf3b4961e6955b167b14185df909fdf14eee5953fa75c1c4a7ae875083e SHA512 c3aa2fddeb8b99326ee6060e85b8b104e56d46fc7c0a546f1e58bf1cab5269747751ad46e5657f25bb352e17bc77761b7084f453feb6f4deea807ecbc8cefb5e
+EBUILD exim-p0f-0.1-r1.ebuild 631 BLAKE2B aaa68b7cb74d0ade0e294e23318508ff4707de40bf2b50d39bf048dd68f142acfbf4a04ff4563f4747254b935e944324d21214dbffcf404001fa23cc7154bc46 SHA512 484b1d5f6c4cd6f9a61f040d921332bda35fdcdc065112577961e1b6b2be0fc672867a8bddbc3140d1f6686de870deeff205749d9a68a11c17c6e2c8d5aad4bd
 MISC metadata.xml 583 BLAKE2B c5fc0490ecbd798b0e15bdc44e80dd3f796bb1e5592fe0b1a2a18f59fff2937b4982cca45b8e3fefd88a97af7e446f2cc638e405bfb78e67142790578d2ad942 SHA512 bf47f55a81bc369964e41f01f0d70b966349c5c03100cd0f156c66d6fbf210c9ef93ef6b338b265e927eb6e1fa7a687064d099d6d85b7b1a17210c2466f75cc5
diff --git a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
similarity index 91%
rename from mail-filter/exim-p0f/exim-p0f-0.1.ebuild
rename to mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
index 885ec0c74647..0a4399207165 100644
--- a/mail-filter/exim-p0f/exim-p0f-0.1.ebuild
+++ b/mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=net-analyzer/p0f-3.05_beta
 S="${WORKDIR}/exim-p0f3-dlfunc-${PV}"
 
 src_configure() {
-	append-cppflags "-I/usr/include/exim"
+	append-cppflags "-I/usr/include/exim -DDLFUNC_IMPL"
 	econf
 }
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e7f4b0a46926..4049e16fdffd 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 217c87e5f459..3b87787dc45e 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,16 +1,9 @@
-AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c621d9b47f087397d417d854f593576229fac3d0ec17c5ba95bd4d44b75b270ceb754d50bd5388c96f542af7d21fb SHA512 fff7b217002d4f270ba20bdce9dcec44b4d1a68f4ea5df45880f5766b897ae8dcf051612416aac28e80d6063c9a461acbac998bd51eef1878bf590a8d75d0963
-AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
-AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
-AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
+AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142d93224bc240928c2b37101f71a19f31f240ac6c1f28931e544b5e277b82e6f0baceb0634fb92a74009b0c3b93d49262824 SHA512 cd8bf4bdf1e792ec4a9c7177cfd2e0cae42d0fa4ad016bb5372826e776170c6d4c53cdd2013784410fac9e4fd674afe3030b64577b2ac9f4b019d84510425614
 AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f
 AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
 AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
 AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
-DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
-DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r5.ebuild 2823 BLAKE2B 496e75f46e8ef562476c1d6a72d76e2068cd797a29f86dd32dabfd4338a594a04b3aa7e94c06b3c02402c21b61ca71a46a2c7f9d2bb803f63f5c35a6709889ee SHA512 6a05758d6d57e2c838a7aa520bb721c112dcdafd2305566e2dc7e8769ce91def379df759db8415c44387afce2ad7496b4e3a868c4b16786a311a2ded15b47234
-EBUILD fontforge-20190801.ebuild 2470 BLAKE2B 316185d2a92b3a9e508ffc5c4fb699d297c90940f1fd3d973fd88f47610e45547276c54abb89f105f1f2dd98c1f4854ae5137acce3871a315ca3f55b5e6efdc3 SHA512 3e98601babb0991fbab2c36292f8cef069b976cbcc82fccff1b01170b77fecb4ccfc09448409f071f7611222f3e2d65f7a60ee35f2cc1cd4be821d6c981a2e78
-EBUILD fontforge-20200314.ebuild 2975 BLAKE2B 4605beb488757331c9571e0c17239c102cd9d4f25855d5a439c03278672e284fc6a7965d81ae440e325c348603390246c7270877d07f27c9004a234789e21a2c SHA512 dde930620c5f919aa02f2cc41297ee6509f3bee0f2feef0b7dad381f9f22bc24d222885d881e1bac173a04e01c15a852641a3827a74cbb3362504bb6fd573492
+EBUILD fontforge-20200314.ebuild 3027 BLAKE2B 6279419e6cc43c67c7089acf6585563c3be3bbe67447129cc6e480d76ace2091f7430c6ae2353bc17df3e8ad70a6dfc0a26c2757fddbfa463c21e4eb2055852a SHA512 f86153004126af75d1c752139caa0cd0a9af482dcc032d28844cba7d038fced7e7cab7c3964a8583daa94ce5ccb2eca12444e9aa539563587caa4149b600d522
 MISC metadata.xml 968 BLAKE2B 25c959d8983e879ee629f097471240a284877f9b3881c1530b91ecfee2c1207c57811a9498f92701fabafee2d8756bf75885ffe55021ab8f6194d5ea2b4c52d2 SHA512 1fb9e55e26f8974a5cc3dd421fd644ec55761c2a6767c7c8d32f8f514720e4dfc3509645bce2acc082cfca6f4b4ed4fe633d1bc9d3074cfe8ba53ae5b1b16004
diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch
deleted file mode 100644
index 48301dabb2f1..000000000000
--- a/media-gfx/fontforge/files/20170731-PyMem_Free.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Wed, 13 Sep 2017 17:22:18 +0800
-Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used
-
-https://docs.python.org/2.0/ext/parseTuple.html
-
-diff --git a/fontforge/python.c b/fontforge/python.c
-index 5d6820c40..c6d7aca2b 100644
---- a/fontforge/python.c
-+++ b/fontforge/python.c
-@@ -607,7 +607,13 @@ return( NULL );
- 	}
-     }
- 
--    if ( !SetPrefs((char *) prefname,&val,NULL)) {
-+    bool succeeded = SetPrefs((char *) prefname,&val,NULL);
-+    if (val.type == v_str && val.u.sval) {
-+        PyMem_Free(val.u.sval);
-+        val.u.sval = NULL;
-+    }
-+
-+    if (!succeeded) {
- 	PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname );
- return( NULL );
-     }
-@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) {
- return( NULL );
- 
-     ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom));
--    free(name);
-+    PyMem_Free(name);
- return( ret );
- }
- 
-@@ -1361,12 +1367,14 @@ Py_RETURN_NONE;			/* Well, that was pointless */
-     if ( import==Py_None )
- 	import=NULL;
-     else if ( !PyCallable_Check(import) ) {
-+	PyMem_Free(name);
- 	PyErr_Format(PyExc_TypeError, "First argument is not callable" );
- return( NULL );
-     }
-     if ( export==Py_None )
- 	export=NULL;
-     else if ( !PyCallable_Check(export) ) {
-+	PyMem_Free(name);
- 	PyErr_Format(PyExc_TypeError, "Second argument is not callable" );
- return( NULL );
-     }
-@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) {
-     if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) )
- return( NULL );
-     LogError(msg);
--    free(msg);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) {
- return( NULL );
-     if( showPythonErrors )
-         ff_post_error(title,msg);		/* Prints to stderr if no ui */
-+    PyMem_Free(title);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) {
-     if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) )
- return( NULL );
-     ff_post_notice(title,msg);		/* Prints to stderr if no ui */
-+    PyMem_Free(title);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1511,8 +1523,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_open_filename(title,def,filter);
--    free(title);
--    free(def);
-+    PyMem_Free(title);
-+    PyMem_Free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
-     reto = DECODE_UTF8(ret,strlen(ret),NULL);
-@@ -1534,8 +1546,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_save_filename(title,def,filter);
--    free(title);
--    free(def);
-+    PyMem_Free(title);
-+    PyMem_Free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
-     reto = DECODE_UTF8(ret,strlen(ret),NULL);
-@@ -1558,8 +1570,8 @@ return( NULL );
- return( NULL );
-     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
- 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     cnt = PySequence_Size(answero);
-@@ -1568,16 +1580,16 @@ return( NULL );
- 	cancel = cnt-1;
-     if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) {
- 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- 	free(answers);
- return( NULL );
-     }
-     for ( i=0; i<cnt; ++i ) {
-         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
- 	if ( utf8_name==NULL ) {
--	    free(title);
--	    free(quest);
-+	    PyMem_Free(title);
-+	    PyMem_Free(quest);
- 	    FreeStringArray( i, answers );
- return( NULL );
- 	}
-@@ -1587,8 +1599,8 @@ return( NULL );
-     answers[cnt] = NULL;
- 
-     ret = ff_ask(title,(const char **) answers,def,cancel,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     FreeStringArray( cnt, answers );
- return( Py_BuildValue("i",ret));
- }
-@@ -1608,23 +1620,23 @@ return( NULL );
- return( NULL );
-     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
- 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     cnt = PySequence_Size(answero);
-     answers = calloc(cnt+1, sizeof(char *));
-     if ( def<0 || def>=cnt ) {
- 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     for ( i=0; i<cnt; ++i ) {
-         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
-         if ( utf8_name==NULL ) {
--	    free(title);
--	    free(quest);
-+	    PyMem_Free(title);
-+	    PyMem_Free(quest);
- 	    FreeStringArray( i, answers );
- return( NULL );
- 	}
-@@ -1634,8 +1646,8 @@ return( NULL );
-     answers[cnt] = NULL;
- 
-     ret = ff_choose(title,(const char **) answers,cnt,def,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     FreeStringArray( cnt, answers );
- return( Py_BuildValue("i",ret));
- }
-@@ -1654,8 +1666,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_ask_string(title,def,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
--- 
-2.17.0
-
diff --git a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch b/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
deleted file mode 100644
index 812f7a444721..000000000000
--- a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix unaligned access in gethex()
-
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -3393,6 +3393,7 @@
- static int gethex(FILE *sfd, uint32 *val) {
-     char tokbuf[100]; int ch;
-     char *pt=tokbuf, *end = tokbuf+100-2;
-+    uint32 u;
- 
-     while ( isspace(ch = nlgetc(sfd)));
-     if ( ch=='#' )
-@@ -3416,7 +3417,8 @@
-     }
-     *pt='\0';
-     ungetc(ch,sfd);
--    *val = strtoul(tokbuf,NULL,16);
-+    u = strtoul(tokbuf,NULL,16);
-+    memcpy(val, &u, sizeof(u));
- return( pt!=tokbuf?1:ch==EOF?-1: 0 );
- }
- 
diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
deleted file mode 100644
index 30731b904f25..000000000000
--- a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Sat, 9 Sep 2017 08:03:57 +0800
-Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding
-
-Failure to include this was causing an implicit pointer to int conversion
-which results in an invalid pointer address on 64-bit builds.
-
-Fixes #3145.
-
-diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c
-index ab8388539..7a188b7a2 100644
---- a/fontforgeexe/startnoui.c
-+++ b/fontforgeexe/startnoui.c
-@@ -27,6 +27,7 @@
- #include "fontforgevw.h"
- #include "scripting.h"
- #include "start.h"
-+#include "encoding.h"
- 
- #ifndef _NO_LIBUNICODENAMES
- #include <libunicodenames.h>	/* need to open a database when we start */
diff --git a/media-gfx/fontforge/files/20170731-tilepath.patch b/media-gfx/fontforge/files/20170731-tilepath.patch
deleted file mode 100644
index c14d81dc430c..000000000000
--- a/media-gfx/fontforge/files/20170731-tilepath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix implicit declarations
-
-Fixed upstream in a larger refactor.
-
---- a/fontforgeexe/tilepath.c
-+++ b/fontforgeexe/tilepath.c
-@@ -24,7 +24,9 @@
-  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
-+#include "cvundoes.h"
- #include "fontforgeui.h"
-+#include "fvfonts.h"
- #include "splineutil.h"
- #include "splineutil2.h"
- #include <math.h>
diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
new file mode 100644
index 000000000000..d6beff7984c9
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
@@ -0,0 +1,38 @@
+From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 May 2020 05:06:07 -0400
+Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246)
+
+This should fix a build failure on Linux with musl libc due to the
+missing sys/select.h include.
+
+MacServiceReadFDs seems to only be called in startui.c, also behind the
+__Mac macro.
+
+Bug: https://bugs.gentoo.org/706792
+---
+ gdraw/gdraw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c
+index 1fb3354b1d..6bac57b92a 100644
+--- a/gdraw/gdraw.c
++++ b/gdraw/gdraw.c
+@@ -32,7 +32,7 @@
+ #include "gkeysym.h"
+ #include "ustring.h"
+ 
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
++#if __Mac
+ #  include <sys/select.h>
+ #endif
+ 
+@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp,
+ 
+ void MacServiceReadFDs()
+ {
+-#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__))
++#if __Mac
+     int ret = 0;
+     
+     GDisplay *gdisp = GDrawGetDisplayOfWindow(0);
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
deleted file mode 100644
index 3717888256a5..000000000000
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	cairo? ( png )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( png python )
-"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	cairo? (
-		>=x11-libs/cairo-1.6:0=
-		x11-libs/pango:0=
-	)
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( x11-libs/gtk+:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXi:0=
-		>=x11-libs/pango-1.10:0=[X]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-"
-
-# Needs keywording on many arches.
-#	zeromq? (
-#		>=net-libs/czmq-2.2.0:0=
-#		>=net-libs/zeromq-4.0.4:0=
-#	)
-
-S="${WORKDIR}/fontforge-2.0.${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch
-	"${FILESDIR}"/20170731-tilepath.patch
-	"${FILESDIR}"/20170731-gethex-unaligned.patch
-	"${FILESDIR}"/20170731-PyMem_Free.patch
-	"${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable gtk gtk2-use)
-		$(use_enable python python-extension)
-		$(use_enable python python-scripting)
-		--enable-tile-path
-		--enable-gb12345
-		$(use_with cairo)
-		$(use_with gif giflib)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with readline libreadline)
-		--without-libspiro
-		$(use_with tiff libtiff)
-		$(use_with unicode libuninameslist)
-		#$(use_with zeromq libzmq)
-		--without-libzmq
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Build system deps are broken
-	emake -C plugins
-	emake
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
deleted file mode 100644
index 74590785e86e..000000000000
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	cairo? ( png )
-	gtk? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	cairo? (
-		>=x11-libs/cairo-1.6:0=
-		x11-libs/pango:0=
-	)
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( >=x11-libs/gtk+-3.10:3 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXi:0=
-		>=x11-libs/pango-1.10:0=[X]
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Needs keywording on many arches.
-#	zeromq? (
-#		>=net-libs/czmq-2.2.0:0=
-#		>=net-libs/zeromq-4.0.4:0=
-#	)
-
-PATCHES=(
-	"${FILESDIR}"/20170731-gethex-unaligned.patch
-	"${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable python python-extension)
-		$(use_enable python python-scripting)
-		--enable-tile-path
-		$(use_with cairo)
-		$(use_with gif giflib)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with readline libreadline)
-		--without-libspiro
-		$(use_with tiff libtiff)
-		$(use_with unicode libuninameslist)
-		$(use_with X x)
-	)
-	if use gtk; then
-		# broken AC_ARG_ENABLE usage
-		# https://bugs.gentoo.org/681550
-		myeconfargs+=( --enable-gdk=gdk3 )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}/html
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index ca891a0e81d8..3379e2f1b634 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	sys-devel/gettext
-	doc? ( dev-python/sphinx )
+	doc? ( >=dev-python/sphinx-2 )
 	python? ( ${PYTHON_DEPS} )
 	test? ( ${RDEPEND} )
 "
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/20200314-tilepath.patch
 	"${FILESDIR}"/20200314-big-endian.patch
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+	"${FILESDIR}"/20200314-MacServiceReadFDs.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index e5d37bcc59bc..fa27e6223b7c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-7.tar.xz 9075300 BLAKE2B 669c9c4212afd7a8b6c336378b248607991156807522e0c53920bf846f87168deeba12e282a60e977d1056a32eb06302d8b2422d4982060e88048ae79ae8ad3a SHA512 7eb169679846ae18cc16fbf66d3e5903f4ad38373a4e24c1219fab7a5fe323afd60bd1c540c75931c069116ea8367a89d25c68283276dbfeda67cc4d601b2888
 DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
-DIST ImageMagick-7.0.10-7.tar.xz 9685636 BLAKE2B 20dd94a034038d420906779e78c35c3c7c73370ee7ee29833f63833e8923fb52416a4e4f1a5700795b6722c29dc3b060a3dc1708e267815e86e9e9756200e074 SHA512 020adb329bcc50af52e590b33edc2caf5c0f7b15eacaabd18e5dc9b755314b8238c0b869420662b2b70c406453cf125ed10d2cf0ac94d309c05dfcd7e5820b26
 DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
-EBUILD imagemagick-6.9.11.7.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-6.9.11.9.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-7.0.10.7-r1.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
-EBUILD imagemagick-7.0.10.9.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
 EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
deleted file mode 100644
index f37a0010b4c8..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
-	!test? ( test )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-#S="${WORKDIR}/ImageMagick6-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
index 02b0c9655fe7..f37a0010b4c8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
deleted file mode 100644
index 386e11f90ca1..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
index 4d2561accf79..386e11f90ca1 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 7c85d6ae44e0..1f78f1f4e36e 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -7,7 +7,7 @@ AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3
 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
-AUX iscan-3.62.0-boost-1.73.patch 991 BLAKE2B 0fda795d633dc7fadca96ce8eeb728f47f416a84a5f69d1011d2d53552f123ae29ee83c877ac03facce59041680ccc9dedaed0b1771dd182a59881f7d1f4cbaa SHA512 a68a82e68dc72c1ee746ee46d76602151f33ba6dc2be5209d6b321b62b7a31b8f573b975ae756903a37abbaf4cdb61628a802110e1e641e088016f20130f3404
+AUX iscan-3.62.0-boost-1.73.patch 1315 BLAKE2B 801f6f9e2f91b4a442b673a2cd9630519ea10e08131877eb09ac52bc190316bfdc98fa1ae572ac2122bd9999a10af421d808762b0d7ca07b249d94428acbfb01 SHA512 183cd4e12451dd66ae096cccdc4ea9fdb4264935894a4442aa094e42ca539ad3f9fec6b01aaac3f20263a3425956808a342de886465b6e9700a7c449c031431f
 AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137dd4e4a88ea3b04aa326f8ae82d46e664d19a5fba89122c6959e9aeb33beab56a43128c73b483d99c9ec25bf835 SHA512 b32438d590419a8be3c7f28a545ed4dedab0a6f0bcd0c9f3a81def67164c4156dd52064d8d8ca93cf2550b2184de12c94cffd6b91ef82d832179eb3e9f554326
 DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
diff --git a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
index d55a464823b8..da6cc66c13be 100644
--- a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
+++ b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
@@ -31,3 +31,14 @@ diff -urN a/sane/handle.cpp b/sane/handle.cpp
  
  namespace sane {
  
+--- utsushi-0.62.0/gtkmm/pump.cpp.orig	2019-11-18 03:08:48.000000000 +0100
++++ utsushi-0.62.0/gtkmm/pump.cpp	2020-05-10 21:59:32.986379049 +0200
+@@ -31,6 +31,8 @@
+ namespace utsushi {
+ namespace gtkmm {
+ 
++using namespace boost::placeholders;
++
+ pump::pump (idevice::ptr idev)
+   : utsushi::pump (idev)
+   , idev_ptr_(idev)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1aafa8b2d2de..7ac821526f55 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 603527e70619..b5add7294aa7 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
 DIST Image-ExifTool-11.93.tar.gz 4799548 BLAKE2B 29867c0407bed7568d92a4b8a0df1ea1377ad9ea54ea9496d09b5b76d946999db312247d6044c179cb064471f888c50c31bc85ddd44475a78a122eb413d73bba SHA512 e8d9dd34710e3346788e10a3b50e4d2a4ba1aeef1969efeec1ddcb7507378b313554e00587cda9c71a325f7d4d7238c91f743c67051d9cef8a012798551dcc59
 DIST Image-ExifTool-11.95.tar.gz 4802010 BLAKE2B c1486ed0c84d6837b9bcdbdee31af5c4c3038442cac8a516b6b7f079bdfb28858ddee18284fa3a88925cdea70a87c1cd444e35fa99ce1b201af03bf1c084d796 SHA512 9def56bde479312584c60ec847338aa55fb3697b6c0e8f894291f6cd67cd16440b563a3982bcec3d787860ba35046f73089f90065891f6f6d93d46243a08c485
 DIST Image-ExifTool-11.98.tar.gz 4804406 BLAKE2B 86bf7fdcc9781fa22e379e3f04ec01b43451978ae33f1c811796ba820198ca417a9ca94b634a8c39acb01604bc8004f47c20e747e6b19f5b4833d29c5cee8fb1 SHA512 d992173a16679b0c3b9fcc466713d5c208e7b161c542535e88088f9695ec14f0ff76ae5fa46d0d6065a8ee366464d0602783170438e2f8fe02d21e458365bbb0
+DIST Image-ExifTool-11.99.tar.gz 4806946 BLAKE2B bec63b26674d551b12965d984610776ea70ff8a4969d83e26677f860af418a792bf26546daa4d487adb521a77da64298907fb3b203c20c827b1197ce9e24b34b SHA512 e8d7d9dcf57b71553cf894bb26997e4b5b79e23bb0ccb2b496e1ed7e39a0c65933492a01ec164f53cb9633457721c6bc938002bfc1f81bb020a455b080b1d1fd
 EBUILD exiftool-11.93.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
 EBUILD exiftool-11.95.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 EBUILD exiftool-11.98.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.99.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.99.ebuild b/media-libs/exiftool/exiftool-11.99.ebuild
new file mode 100644
index 000000000000..58ee12770a1c
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.99.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index e65f377471a1..b7a9d9394b7d 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -11,5 +11,5 @@ DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
 EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 7566cefe70ef129bafc17ed928b0e7c1ccb5b1b05d25b7c6016e08f62ea680ef96e9a9a7a48ed8e0e49b4d3e87e8dbf90810b1b992a4ce0f52bbb703cec9af86 SHA512 581529ce33b146df1711422a3b916d1af1c74e85669d274e8639acaa881f56404f0c4afd62886688d77439a2467c6c9045864413b50b47452742b26b3da1be24
-EBUILD gd-2.3.0.ebuild 2576 BLAKE2B 027e997cd6bf8741ad9710fd459701fca2c47733bbf5796e1128a68bd7ce0b720d96c19fb28c54d0036550d26166c736a71849331c2309045318a317eca678b6 SHA512 f7d058be7998eca7ed5e1ea5e94f8f7996bf4d9ab70e0d156382351e7f3967b08dab0bb00d6f96e2802db79993046ecab1d393f4b149012fb5a4c8c3dc6ef3bc
+EBUILD gd-2.3.0.ebuild 2574 BLAKE2B c80be170ccd5e7a17ddb0e6c793833c05aa2703090b1b6e774284e04f1fc4caebdfdd49907d72bd0e8b458fb99ab22628042995894ad930a7a9920c169fda4c0 SHA512 4d5fbcb78a88d0942daa7320da23dd5aca7d0093883d8f1a5224b3d26aff037b346c19c0b1c3b69b41a04b435289b44e25f4db6516ca976de75073f95b142fb3
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index 3af7a843a9f9..c4adf18cf67e 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 001011051372..13684df80ac6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,9 @@
 AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f
+DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
 EBUILD harfbuzz-2.6.5.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
+EBUILD harfbuzz-2.6.6.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
 EBUILD harfbuzz-9999.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
new file mode 100644
index 000000000000..085525d97eed
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index dcca3bc9e6d1..8ecb2e3ca9fb 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,8 +1,8 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
 DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
 DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
-EBUILD libdvdnav-6.0.0.ebuild 1150 BLAKE2B 80f8afd10491a987ef3d478b07bef5b20c750a47772c71434439476aabd9e183d771d2bf74028d409ee286ad37c379140f0188bb9ccef945e44ec0fc71f215ee SHA512 5c100a56027ff7b7a53e570ab26820c7ad53dd161dcd4bb7fbfaf181541b847c7745dcc87adc7abc1a2655ec989869382e7409b3f7327291b719521927fb207d
-EBUILD libdvdnav-6.0.1.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
-EBUILD libdvdnav-6.1.0.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
-EBUILD libdvdnav-9999.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
+EBUILD libdvdnav-6.0.0.ebuild 1152 BLAKE2B f2e7ca059a0bd8b545b2fb857e555827c3b5eee4f479c0bd75e4bc189b71025f628bd57b20d394fff6e55e585b96829a2ff9c31a33d1816a0488e844953f4e0f SHA512 8486624d1b0dcc2c80f9bf1acca8447c039741b225fe59e7d71bb94b63645b4ab2c1b7af733cf05df872d904334919363faa13121271f4074484d4684a25cd2b
+EBUILD libdvdnav-6.0.1.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
+EBUILD libdvdnav-6.1.0.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
+EBUILD libdvdnav-9999.ebuild 1179 BLAKE2B 25485ab612b158f77c9428015d1438493386dfc156be9d14c257e3d5e77b7883b1055926dc226d6f4a956f79f4a9389e1040c6ea2e80c3706199e25658e8fe34 SHA512 89016a1a394878a6b6b07e938fe2207aa9620f0f3e20c49f763bc47944ea18480d5d569bca1fa880d9e25c92a1fd120026432adbb6c72eb879954a0c18e146bd
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index 4d42ef140d4f..a3904ad125eb 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-5.0.3[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-5.0.3:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
diff --git a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 945ffe1f209c..4d90610679df 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 # To get pkg.m4 for eautoreconf #414391
 BDEPEND="
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index c3e28f0baa34..01b869ad134d 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,10 +1,10 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
 DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
-DIST libdvdread-6.1.0.tar.bz2 391316 BLAKE2B 98a701b467c1f42aa54189ee16c786c6c87623e6dad3d43078f53b0fe16bf5e371f882a0afbd157b4ab622f1e65b84954f79c7186fbc781c53877da01cb1c7f6 SHA512 f34d039d1fbe74076cb3073a3dc6a9f3377e3bd05231a04869ca5faeb96e737750c8e019b908da89e83c14a2df38950a2d61a7c7a6c44c988b710fa875b236b5
+DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
 EBUILD libdvdread-6.0.0.ebuild 1120 BLAKE2B af5b9cf20d17d56f243d0c02d1b02a0e73138a88b021dd2ae7f8763edadb7d42a091bd713f9a3c0ea83ffaf35fb8074562017778ef9caf87321c264a12829018 SHA512 a54038c46bfbf00875e5b578d58c169a8db493777034a0fa819c5bbb804ea200e0b7a23ccefbe9a10e68a039c408c9659b88e0e41f2965c6a00fd6cb481b9507
 EBUILD libdvdread-6.0.1.ebuild 1136 BLAKE2B 33c4c015352f6022e0af35590067fb3c4e28fef3f46ee1459775b478600b3d15ab294d97e8cffa23340c96b94aaa0bba0be05fabfdb603a5167a27bc829f412e SHA512 537d8d40bd7c93f872e97c603ecf72d550aa7b2c00268a1cbc3ef070ef16f0d50193138e5ab937dd2c6fba82113787e249b42e3160e2c438c76968c3a9fa0553
 EBUILD libdvdread-6.0.2.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
-EBUILD libdvdread-6.1.0.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
-EBUILD libdvdread-9999.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
+EBUILD libdvdread-6.1.1.ebuild 1170 BLAKE2B b1d522ff8819614362dc66d43c911f57955164692f93b197e7350177e154c860c8b84a5ae08273c3745d5a4e65f1665a523c6e97d898d24739e9387bee8321ba SHA512 daa7b0fc6c4b83604cda58d6c4e1737dc2423f99ab89652a965f65320865ddf80a8f6609c0871a3f6a302518b96f40f04a40f9af3d3b79bcac7fc35e10b8e2b6
+EBUILD libdvdread-9999.ebuild 1170 BLAKE2B b1d522ff8819614362dc66d43c911f57955164692f93b197e7350177e154c860c8b84a5ae08273c3745d5a4e65f1665a523c6e97d898d24739e9387bee8321ba SHA512 daa7b0fc6c4b83604cda58d6c4e1737dc2423f99ab89652a965f65320865ddf80a8f6609c0871a3f6a302518b96f40f04a40f9af3d3b79bcac7fc35e10b8e2b6
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.1.0.ebuild b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
similarity index 97%
rename from media-libs/libdvdread/libdvdread-6.1.0.ebuild
rename to media-libs/libdvdread/libdvdread-6.1.1.ebuild
index b35ac186b9a4..1f271a77fb76 100644
--- a/media-libs/libdvdread/libdvdread-6.1.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="0/7" # libdvdread.so.VERSION
+SLOT="0/8" # libdvdread.so.VERSION
 IUSE="+css static-libs"
 
 RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index b35ac186b9a4..1f271a77fb76 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="0/7" # libdvdread.so.VERSION
+SLOT="0/8" # libdvdread.so.VERSION
 IUSE="+css static-libs"
 
 RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index aa47f45759ac..258d9d92c1df 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,6 +1,7 @@
 AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
+AUX libprojectm-3.1.3-bashisms.patch 1741 BLAKE2B 16cf0a172fd79ed442313ce27761540d71f2d45e611aea80f29a8638b5c6fe1dc0b04ca8322fbfba3b7f2d60b9d220b6d5ba7367ef60094d483f6a922ddcf336 SHA512 e5600dd34d48d476331b897c87f6c1c88cf5fe3ded8140bc225b95783795f57433d1e44efb61cc5c38dbb57927c9a309090296f09e00a3a2775f17059657eb89
 DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
 DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
 DIST libprojectm-3.1.3.tar.gz 54503797 BLAKE2B 2aa8900887201f00f85cbd2e4eb908d5825b95364a2df39cecd9ccdd63e677766bc45fc5280b4b773632b920b3331127be159d9e5e29304c3df4f049e49021c3 SHA512 c9910ec9dd3e6625df885a23cb72616723142974ee80cc40d108992e997342f7b8962c63d5a0512b793f425c7abb0477dbd5d641a70161d8e42f1489e08f402b
@@ -8,6 +9,6 @@ DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b96
 EBUILD libprojectm-2.1.0-r2.ebuild 1469 BLAKE2B 61fc28b30b33e2efa6ee6cad2ba6da19193b1cff80ea981348cb4481cdf7eb6c783492d82ff0d99bce6891914cd71ff6f3c9513a3164bef454f7f45d7dcc3811 SHA512 b05e16995fe77d7ccedbeba67aee38dbae64c2a5f6effdb8f7d67b2bcc353393f2aeea6227e4c8df8753be84ec2b3d301595184a40b008dbe68461922b9f27a3
 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1211 BLAKE2B b32f57d7dcce5a3c32dd0cd4a6277bd427159b06ba8cd1068049856c97e8337a5d351e98486e1648931224b784c87bf6d06a3b5bece4a0916cb3b004014364b4 SHA512 8952925a4c9573f7b97b44a10b91c42872a7f5d9c2fc3a7f36bf4a8f9ed7cf80aaea453f88918e9f5c98471aa2f00e72b729ddbe1470478c94ca7b0897a14ca4
 EBUILD libprojectm-3.1.2.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
-EBUILD libprojectm-3.1.3.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
+EBUILD libprojectm-3.1.3.ebuild 1400 BLAKE2B a1d8c7b7f9dc0a0c4e65ab3e31b1dff97f769d343e6f4074b24632bba4568f42e60f76ef11b77d5d93ef30b0c602cf83f9044f5cab8bba83f412c38c2e943277 SHA512 8dcec3005bd5f5f2f8b357afbc4da25a3e374b12b964019531b58ff2bcd96ded871a7fe8c69c97d7b0337a05536947b49890fd1d6df34bdc522d4553ccffc3d1
 EBUILD libprojectm-9999.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
new file mode 100644
index 000000000000..8d84ece802cb
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch
@@ -0,0 +1,47 @@
+From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 14 May 2020 11:46:50 +0200
+Subject: [PATCH] configure.ac: Avoid bashisms
+
+or else we end up like this:
+
+  ./configure: 18902: ./configure: Syntax error: redirection unexpected
+
+or
+
+  ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found
+  ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found
+
+Gentoo-bug: https://bugs.gentoo.org/714098
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5fa53eca5..ecf85e076 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local])
+ 
+ AC_PROG_MKDIR_P
+ 
+-AS_IF([grep android <<< ${host}], [],
++AS_IF([echo ${host} | grep -Fq android], [],
+   [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [
+                         CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
+ ])
+@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"])
+ AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"])
+ 
+ 
+-my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
++my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits"
+ #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
+-my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" '
+-my_CFLAGS+='-I$(top_srcdir)/vendor '
++my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\""
++my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor"
+ AC_SUBST([my_CFLAGS])
+ 
+ 
diff --git a/media-libs/libprojectm/libprojectm-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild
index 1dc01b435666..8a83145eb817 100644
--- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.3.ebuild
@@ -22,6 +22,10 @@ LICENSE="LGPL-2"
 SLOT="0/2"
 IUSE="gles2 jack qt5 sdl"
 
+PATCHES=(
+	"${FILESDIR}/${P}-bashisms.patch"
+)
+
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
 	media-libs/mesa[X(+)]
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index e64f21788d7b..8e6de720f36d 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,5 @@
 DIST libtgvoip-2.4.4_p20200301.tar.gz 1481876 BLAKE2B cb589eb5c1aacae92f2a6701fed727807f0527320276cd440754052469bae99d613ba3eb5f5166c169d9d0ee7eb77913e98b196f2269bb0a234bee8eed251ab1 SHA512 8d7e540e62447cfaf3e0ef98a2c3c0e9e16019299abd9e384f488d3f34b7efb750c3174175c287c2b520ebec649df55055bfca9736617c6adc33709c25a0cf0f
 DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
 EBUILD libtgvoip-2.4.4_p20200301.ebuild 1022 BLAKE2B 9534bffdb331c660fed9eb6be2a0a51bb6990351eca8fc0786e609def80f8853a306cf4cfd46cb9af6ac5d2eaafa67d6a6c90938c1062a398ff1c39624825daa SHA512 d30198dfe0910e53912ea6386253472811f345cba956bd6a29ee598ee728ab62ec80647e3dcdafbcdc99d7e1da44c264f75cec74317ed5e5dbe2e0e7e2a52f88
-EBUILD libtgvoip-2.4.4_p20200430.ebuild 1040 BLAKE2B 386991f8aa3a8e3c42c08955b954b8401e204346e90a1aa28187018c3a4af3399b27d81359b32c378790cca82537c3a6625277d4ef5cecd8d26184dda139b3cc SHA512 2ebb9d4ba8ba165a28a66f5b4aaeb8a37aaa02cc126619f318cee0c0bd99da64465e9a0d6ba3475658b19895761334e5fe8c1afa08386247a2ff36b38dbd8ffa
+EBUILD libtgvoip-2.4.4_p20200430.ebuild 1039 BLAKE2B 21f3e2037b6d704070f183c1b21a7a82e772c1ee9119530a202063e7606244b9585e41dd39b82de347d6f72d6d4d88a92a4d96e928338a72b06b8f028db7e6c4 SHA512 76558155767123484954b131ff62e85b22f23cc40c4c867fd29aa2e010231ed03bde4dc617e3d2fb8104f3e8677b94faf48854b7912258bb1999a92368dcd1bc
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
index 7d02572b760a..3438d6218474 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa +dsp libressl pulseaudio"
 
 DEPEND="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ee5183bdb17a..2dca519423c9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,11 +3,15 @@ DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a
 DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f SHA512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
 DIST mesa-20.0.5.tar.xz 12257484 BLAKE2B 12d2530fa77dffadea74908e0b8e52f19023f0e2d012c607d7d5fc8b1380efad13dee50eee99a453b751340a3633b6260a3f1c82e5b16c03051df2fca6947740 SHA512 6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08
 DIST mesa-20.0.6.tar.xz 12275708 BLAKE2B 9f6d9ae9c260e396670a3980ba83914ad0c1b7dc5f08471a78e4ab76e6ce3c18b96152fefc3846d89840be971180a2f4c176d40beb2c4b1f572011cb4b913f58 SHA512 a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90
+DIST mesa-20.0.7.tar.xz 12308160 BLAKE2B fac8dffd08ada27080ee4c6f1e0dce69218c8f15b97ca59d9a1dc84098b7d376cea6ccdf05957690beb47a7c2ecfd75497bfa150c7c46a0c509ba37abb0e5359 SHA512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685
 DIST mesa-20.1.0-rc2.tar.xz 12577196 BLAKE2B 8dc88b2546fd85874fad03258b8b8c7d1dbe681f568e5947e1d758234a8f6559b60810142c125bb56142be6926c50a8c20aebf45271f0e8270ff057dbce472aa SHA512 b912b1af69d9c33f1d0855887d4e5c1ea3dc10e7ed875d3285ca13b62314647b56470149484f270e8c8ff0ce4818fafd1537a71b59852957aab26f36e53edfbd
+DIST mesa-20.1.0-rc3.tar.xz 12585796 BLAKE2B 7b1b79d790541b29d25cc03900acf0bef517baf67db2c600a5fe3207ba05ff5d9cf332a97e994625ef6626e84202665c3531bada693f2956ab6b8f213df64545 SHA512 20ec0dbace5eb7b8ed7a9f2deab9621fa2ed9d485fb884af95caf0ce5ae14de25d89d9d7c374f0dc891cb5644096dc8576bfbecfaf1604954176891345884175
 EBUILD mesa-19.3.5.ebuild 14493 BLAKE2B 87bf68a63138a3cd69ef55bd0e32914ecc322defc089dd93fd0dd44cffbcfee156bdf40a7f5fd0b8b05dc5be54d56362500011751adad3635a33a3d73288f980 SHA512 fa540374ada5503e9d87cc436d75de9351092fd82cf556c9398f87abf0c1493c7592b5c870dadfa784c46f5d8218805143088797f2d697772ef8f9ca593cd8ee
 EBUILD mesa-20.0.4-r1.ebuild 14505 BLAKE2B 048aa31180d1242e2617dd6f33adbae79d37e4def656f926faf8496b5925b52340783560ba45ffac730e1f4aa227ae77af093a5bb381e24a435e8df62a6cf852 SHA512 272c0a151a06f5dc594f547358fd38a4cbde6ad6bc6329b4b05c88e42efe1c90d65fcd490565f7855422b6f677368f3ec71811348e9eca3622af70092de2cffd
 EBUILD mesa-20.0.5.ebuild 14501 BLAKE2B 17f9ccacf1ad095db48ecc8e510334a639885c8860a9fd0fc19e1ac434e46fd44a4431f69e7974890ed2b8425a6291e18a33de9cab128fca95a00cd9949daf7b SHA512 9874a7416e92a72c0fc97eb5cabb686f2b8d27e6bebfc8322f3966e736259a07a1762fd4746a634dbffb3980c2efc51c45ae900f626242bc6fc667c641843dad
 EBUILD mesa-20.0.6.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+EBUILD mesa-20.0.7.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
 EBUILD mesa-20.1.0_rc2.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+EBUILD mesa-20.1.0_rc3.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
 EBUILD mesa-9999.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
 MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
diff --git a/media-libs/mesa/mesa-20.0.7.ebuild b/media-libs/mesa/mesa-20.0.7.ebuild
new file mode 100644
index 000000000000..03083871b14d
--- /dev/null
+++ b/media-libs/mesa/mesa-20.0.7.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit llvm meson multilib-minimal python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-20.1.0_rc3.ebuild b/media-libs/mesa/mesa-20.1.0_rc3.ebuild
new file mode 100644
index 000000000000..03083871b14d
--- /dev/null
+++ b/media-libs/mesa/mesa-20.1.0_rc3.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit llvm meson multilib-minimal python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e0102246a184..be3d0ffbe44c 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-srt/Manifest b/media-plugins/gst-plugins-srt/Manifest
new file mode 100644
index 000000000000..22df99e7b1b7
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/Manifest
@@ -0,0 +1,4 @@
+AUX gst-plugins-srt-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
+DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
+EBUILD gst-plugins-srt-1.16.2.ebuild 431 BLAKE2B c16ea84e7a31f9de63f771d7f1d022f201b6d79923408706211f78620b6da38e12d248d8f6b248aef479a9b8d0f877189ae510c25da036b5e8f85e856ddfecd8 SHA512 74eab94532cd66e83ca4aadd5e25c0d35b236d3ee5adb52d3f24fbb2810f51323f4525c5b6ec34504e8fca2c292cf02466c5f084d1d53b5c1c871c8902059952
+MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch b/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch
new file mode 100644
index 000000000000..f5caac7872d1
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/files/gst-plugins-srt-1.16.2-make43.patch
@@ -0,0 +1,200 @@
+diff --git a/common/glib-gen.mak b/common/glib-gen.mak
+index ef93a5f..cc02239 100644
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak
+index 76b2233..5f2b1ed 100644
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,6 +1,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -8,7 +10,7 @@
+ #glib_gen_decl_banner=GST_EXPORT
+ #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+diff --git a/ext/srt/Makefile.in b/ext/srt/Makefile.in
+index 09109c3..e5f2a9d 100644
+--- a/ext/srt/Makefile.in
++++ b/ext/srt/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -794,7 +796,7 @@ noinst_HEADERS = \
+ 	gstsrtsrc.h \
+ 	$(NULL)
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/ext/srtp/Makefile.in b/ext/srtp/Makefile.in
+index 758db8e..017c075 100644
+--- a/ext/srtp/Makefile.in
++++ b/ext/srtp/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp
+ BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
+ nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/ext/webrtc/Makefile.in b/ext/webrtc/Makefile.in
+index da8fd9a..ec3588f 100644
+--- a/ext/webrtc/Makefile.in
++++ b/ext/webrtc/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \
+ 
+ libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: all-am
+ 
+ .SUFFIXES:
+diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in
+index ca1bde5..9d54c2e 100644
+--- a/gst-libs/gst/interfaces/Makefile.in
++++ b/gst-libs/gst/interfaces/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY
+ glib_gen_prefix = gst_photography
+ glib_gen_basename = photography
+ glib_gen_decl_banner = GST_PHOTOGRAPHY_API
+-glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
++glib_gen_decl_include = ${H}include <gst/interfaces/photography-prelude.h>
+ built_sources = \
+ 	photography-enumtypes.c
+ 
+@@ -806,7 +808,7 @@ BUILT_SOURCES = \
+ 	$(built_headers)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/gst-libs/gst/mpegts/Makefile.in b/gst-libs/gst/mpegts/Makefile.in
+index 7a145cb..91a81cc 100644
+--- a/gst-libs/gst/mpegts/Makefile.in
++++ b/gst-libs/gst/mpegts/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS
+ glib_gen_prefix = gst_mpegts
+ glib_gen_basename = gstmpegts
+ glib_gen_decl_banner = GST_MPEGTS_API
+-glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
++glib_gen_decl_include = ${H}include <gst/mpegts/mpegts-prelude.h>
+ BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
+ nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+@@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+ @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
+ @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
+ @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/gst-libs/gst/webrtc/Makefile.in b/gst-libs/gst/webrtc/Makefile.in
+index 04146bc..1d0db28 100644
+--- a/gst-libs/gst/webrtc/Makefile.in
++++ b/gst-libs/gst/webrtc/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC
+ glib_gen_prefix = gst_webrtc
+ glib_gen_basename = webrtc
+ glib_gen_decl_banner = GST_WEBRTC_API
+-glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
++glib_gen_decl_include = ${H}include <gst/webrtc/webrtc_fwd.h>
+ built_sources = webrtc-enumtypes.c
+ built_headers = webrtc-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+@@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_LDFLAGS = \
+ 	$(GST_ALL_LDFLAGS) \
+ 	$(GST_LT_LDFLAGS)
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
+ @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
new file mode 100644
index 000000000000..b29f5aa8a09e
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Secure reliable transport (SRT) transfer plugin for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	net-libs/srt[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)
diff --git a/media-plugins/gst-plugins-srt/metadata.xml b/media-plugins/gst-plugins-srt/metadata.xml
new file mode 100644
index 000000000000..fb1ea7216a80
--- /dev/null
+++ b/media-plugins/gst-plugins-srt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 78430fd3b32a..c094e9829fdc 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,12 +2,6 @@ AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf566
 AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
-DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3abac35add6feb7955f60ddbd93e9242a84102393de67dda0d39c09632a0cc9a5f54d30c9f91d005696d3a566258bd SHA512 eea5bdb8d89e76c8b6aeb6ec04b77af3048cb41f228d230ba4da6045e9bc691a456023d44d8650fe690b08143567ed5af5b633f5b6522debff79344a813dc7d0
-DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
-DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
-EBUILD live-2017.10.28.ebuild 3973 BLAKE2B 3d0511be782f8265f4976bfa99c2fa8c603702e8ceea1b911e476bd16c33c6ce4ab270b0453d0669632a48a3374e5512b4e75ede9f8356b6551816b69d3fe367 SHA512 87d5e831968a2c974b5d707e5e30ef017eabbb9f3c7f892e84d0b7cde6a4d8e1d1e3eb1e5786ab27ef97e60f9b84f913544143f4b3b40afdd914d0476bcf06d5
-EBUILD live-2018.01.29.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
-EBUILD live-2018.07.07.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
 EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
deleted file mode 100644
index 80f3e6db5e2b..000000000000
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-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="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2018.01.29.ebuild b/media-plugins/live/live-2018.01.29.ebuild
deleted file mode 100644
index d833ddf75eb2..000000000000
--- a/media-plugins/live/live-2018.01.29.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-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="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-plugins/live/live-2018.07.07.ebuild b/media-plugins/live/live-2018.07.07.ebuild
deleted file mode 100644
index d833ddf75eb2..000000000000
--- a/media-plugins/live/live-2018.07.07.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
-	mirror://gentoo/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-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="examples static-libs"
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=7
-SLOT="0/${LIVE_ABI_VERSION}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}"
-	mv "${WORKDIR}/live" "${S}/" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-recursive3.patch"
-
-	if use static-libs ; then
-		cp -pPR live live-shared
-		mv live live-static
-	else
-		mv live live-shared
-	fi
-
-	use static-libs && cp "${FILESDIR}/config.gentoo-r1" live-static/config.gentoo
-	cp "${FILESDIR}/config.gentoo-so-r2" live-shared/config.gentoo-so-r1
-
-	case ${CHOST} in
-		*-solaris*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				|| die ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			use static-libs && { sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static ; }
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-	multilib_copy_sources
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	tc-export CC CXX LD
-
-	if use static-libs ; then
-		cd "${BUILD_DIR}/live-static"
-
-		einfo "Beginning static library build"
-		./genMakefiles gentoo
-		emake -j1 LINK_OPTS="-L. $(raw-ldflags)"
-	fi
-
-	cd "${BUILD_DIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
-		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
-		popd > /dev/null
-	done
-
-	if multilib_is_native_abi; then
-		einfo "Beginning programs build"
-		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
-			cd "${BUILD_DIR}/live-shared/${i}"
-			emake LINK_OPTS="-L. ${LDFLAGS}"
-		done
-	fi
-}
-
-multilib_src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		use static-libs && dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	if multilib_is_native_abi; then
-		# Should we really install these?
-		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
-			xargs -0 dobin
-
-		dobin live-shared/mediaServer/live555MediaServer
-		dobin live-shared/proxyServer/live555ProxyServer
-	fi
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ea7bac7c784a..c35f131ecda0 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index de8cf9095f27..542c80753f71 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,9 +2,11 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abe
 DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396 SHA512 2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
 DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921 SHA512 dec32df70aeb53ecdfbffff8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
 DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595 SHA512 373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
+DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b SHA512 8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
 EBUILD mkvtoolnix-42.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-43.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-45.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
+EBUILD mkvtoolnix-46.0.0.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 EBUILD mkvtoolnix-9999.ebuild 2644 BLAKE2B 9f7f8e110b7f5a7797f7cc56035728fa463f420c95178ea1725bd2040b22c6acb139ddc1f6a7e7d6c04253736c350353dbea43bb63bd2d15707c43a8e7a045d7 SHA512 3d5162c4456d29e8e7149d54cb4ea782de77d961515623ec47f062ee8466a975b19a85fa7c9af93b991eae7b4a9c5548c463fb64d213a2a77ce1ffd0aa237fdc
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
new file mode 100644
index 000000000000..6c3ac899f3d8
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit autotools git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nls pch test qt5"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.60:=
+	>=dev-libs/libebml-1.3.7:=
+	>=dev-libs/libfmt-5.3.0:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.5.0:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark:0=
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable qt5 qt)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myeconfargs+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 4d35df2a35a7..794766a40fac 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,5 @@
 AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
 DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
-EBUILD obs-studio-25.0.8.ebuild 3362 BLAKE2B 04879c362d42af156306d92cb6cbab49200c310c5840113731f378085bb896255f32be6f0ed8a645751ffcb67bdca172f75baa73be46761de759bc8c55009583 SHA512 576a73250a45d5e475e10c310f2b34ebc4284f36b4a2fc677cd93cddf6b5ec99c42f88ce8d4f743347d5bb0cb79158765e2ea6135ed6bf1c7d9486bab39ab4f7
-EBUILD obs-studio-9999.ebuild 3303 BLAKE2B e8a91627cd8eb223ecd5dbb3e1942c469869077dad2e9f5002480e469cb32ef90291e343b5ddb76ae7217a5b800d9b0c8bbd530a86a9e56ee70c7e8626606675 SHA512 8a1ac4260ee446de6dc01f7fd4edb1bb125bd8c3ac2689bd0294dad5c59f57870b086a96a2b5ba03891ba365283cf8d32b4622b7f27f56bd5d0589a4ceea3818
+EBUILD obs-studio-25.0.8-r1.ebuild 3582 BLAKE2B bd105cf404c22f3af270ceec92d733312ca23ed68639efe1140c7fae2fd16426984982ee74f11f16860ddf8d07cd860d84e736b17adeaea122022e56aa356286 SHA512 8f9abd79ae4d751c708c207df5a0a5f10e2b584206ef373bcc070da0c8301dea9be5263926e85f9dbaed5e61135c2e27d3a0142339fbc52abcb27d1a7f385986
+EBUILD obs-studio-9999.ebuild 3523 BLAKE2B c56a4d5ec7c6514d21d9df7d6e838f68b340cd860b939f18b338c248bc19cc0ee34d686c64862798c8bf1abfefce42b545de506c7b53f25cff172ef6836f4d34 SHA512 9a76603b1be0e254898d7e5e8be3ecffca8738488dd0aa81a5cc3509190dcbb820d6940e95c1f2ef1d44d8145f21facf57e5ca756604eab6f0a881233b627c6e
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/obs-studio-25.0.8.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
similarity index 93%
rename from media-video/obs-studio/obs-studio-25.0.8.ebuild
rename to media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
index a97ec6617d42..d6c0853245fa 100644
--- a/media-video/obs-studio/obs-studio-25.0.8.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
@@ -120,6 +120,13 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	#external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 33ca63777c33..1b5be7a26762 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -118,6 +118,13 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	#external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 
diff --git a/media-video/obs-v4l2sink/Manifest b/media-video/obs-v4l2sink/Manifest
new file mode 100644
index 000000000000..19588765905d
--- /dev/null
+++ b/media-video/obs-v4l2sink/Manifest
@@ -0,0 +1,3 @@
+DIST obs-v4l2sink-0.1.0_p20181012.tar.gz 21392 BLAKE2B 7f024a89c900588a4b3a45d598622e05d25b2eabbd007d5ce701d82ab935fa5a267faaf903925ec19e74071b5f4d32a5f39c810d181c97ea047060bfa69c145c SHA512 c64cff7feff7722e8cfd66f92daa46d8cb189da5adc50dabddd21baaa97e033611b94f1dafb9a9ad9a58504930fb40e05d7e5a4d128ee703b60993be7edc063c
+EBUILD obs-v4l2sink-0.1.0_p20181012.ebuild 864 BLAKE2B e15126b24c1ded6adc299b09941b2908551cd523d5a8ba2ee2bde398d4a06d6cec456b818be596c08bc724080f3665dfc8bd3c9e7dae673798531503cc6e0a14 SHA512 f4d6b544ae9020536b00108c7c7eb89cc96c7c982a29fa4cf2507de067e791ba1eedc5aa6f574d992d8ff0fbc074ef4c4f9bfa39eb41c0d3cb86272e01d5caba
+MISC metadata.xml 343 BLAKE2B 6d8ec79efa0900dedd95ea0553bf90149d71f20b3b5daac1ad96df17dbc62c338a987b47344674a708f88060ae4210bf3d763b69e310b75437ef8dcc09bb649a SHA512 0d0dceaa03c65f0df6d9aeda0a1ee8972a181305444735395aec2a6d74c3273c27928008fc4a6d6719d5901ece2a0e69473d7c9df137aff9421483b15b65085e
diff --git a/media-video/obs-v4l2sink/metadata.xml b/media-video/obs-v4l2sink/metadata.xml
new file mode 100644
index 000000000000..4c547b226a11
--- /dev/null
+++ b/media-video/obs-v4l2sink/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>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">CatxFish/obs-v4l2sink</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild
new file mode 100644
index 000000000000..64a8a9cd5f21
--- /dev/null
+++ b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_REMOVE_MODULES_LIST="FindLibObs"
+inherit cmake
+
+DESCRIPTION="obs studio output plugin for Video4Linux2 device"
+HOMEPAGE="https://github.com/CatxFish/obs-v4l2sink"
+COMMIT="1ec3c8ada0e1040d867ce567f177be55cd278378"
+SRC_URI="https://github.com/CatxFish/obs-v4l2sink/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/obs-studio-25.0.8-r1
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i -e '/include(external\/FindLibObs.cmake)/d' -e 's#../UI#UI#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
+	)
+	cmake_src_configure
+}
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
new file mode 100644
index 000000000000..f0873a107659
--- /dev/null
+++ b/media-video/vidcutter/Manifest
@@ -0,0 +1,4 @@
+DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
+EBUILD vidcutter-6.0.0.ebuild 937 BLAKE2B 9d8ac9428cfff9d2b5ce92819ac904af7cfe2f7ddb76e0d305e5e919f67c95d2bcb31df12add844ec6bf4a10604bd64e66a8ab2ad38d0f55c7795dabb4578214 SHA512 0b03f716111381019c0c679784dd8f9aa2359036951387150a01ee3bb3a06aea77052c31f49fab4021afbd59cfcde6401920f4a4d6074b8283606ed980743109
+EBUILD vidcutter-9999.ebuild 937 BLAKE2B 9d8ac9428cfff9d2b5ce92819ac904af7cfe2f7ddb76e0d305e5e919f67c95d2bcb31df12add844ec6bf4a10604bd64e66a8ab2ad38d0f55c7795dabb4578214 SHA512 0b03f716111381019c0c679784dd8f9aa2359036951387150a01ee3bb3a06aea77052c31f49fab4021afbd59cfcde6401920f4a4d6074b8283606ed980743109
+MISC metadata.xml 341 BLAKE2B b4ba35e0ab8990d8adff9beca129b517683baf99330f3df941a01beffaaf3f736b1dcd0d7978b368bc8267fc93d7234649b952c0eba83f8940a56278461fae13 SHA512 89d95e914de7d3ac60dea1040efbcebd2c4c7e048aafa0daa531ffa628dfb6bb9eb75c4c69a888499a8aa4bdf76a53ea2dde595f1134e46d17d334fa81b6809f
diff --git a/media-video/vidcutter/metadata.xml b/media-video/vidcutter/metadata.xml
new file mode 100644
index 000000000000..a56d19341fbd
--- /dev/null
+++ b/media-video/vidcutter/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>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ozmartian/vidcutter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-video/vidcutter/vidcutter-6.0.0.ebuild b/media-video/vidcutter/vidcutter-6.0.0.ebuild
new file mode 100644
index 000000000000..925afa62e558
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-6.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
+	media-video/mediainfo
+	virtual/ffmpeg[X,encode]"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild
new file mode 100644
index 000000000000..925afa62e558
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
+	media-video/mediainfo
+	virtual/ffmpeg[X,encode]"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e10fdd42df5e..7629d9667d49 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,9 +5,7 @@ AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab
 AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.10.tar.xz 26096828 BLAKE2B c189c91e9b4b3601552ea5c00faa6bee9944550e0591a451723464ef6c1884388286638c0e4c936ff4299cac92eff026ba683c71e0e1ffd25f2a9fd701c86d55 SHA512 dcfa39e3e61bf522ea3a0e1686251356ec262dd8826fc64ccae5ac34a62f72ddc9fe9f2e2b45588013d5907e39649cf39d0c9156980d1eb679eac9b9cb434341
-DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
 EBUILD vlc-3.0.10-r1.ebuild 12997 BLAKE2B a31b43dfec44afef1ac10f33a4983a5353abb1e8792afa7f280b2221691c309c5f1f12b0f25d1dad76e1ea6c66003e306c69b72bb9948df16a29a5f3bcb2e841 SHA512 df72bce7d63a9df17ba4384b7f37bca2763ebefbe223da89f31ba472ac9b03eec82052c6f31d20fbae65f8dff2b71878c2d05333f6e6a4feb1c44a9fa9d4d4b4
-EBUILD vlc-3.0.8-r1.ebuild 12953 BLAKE2B 127a5f74a9c7e88a7f1929261c2334213abfdba7c105cb7e6bd1d0ba61abbb07eb65a9bb1a5b2c76e0dd1311ea5da57a08efe0b7de4d298f6cc1491c9cbb3480 SHA512 b13e4e6b896d433f0ff3132663059470c74f6812a85b99e513e7e9d1a7f7a261c7dd13531f1f4c5953daf6336622db7730d80c9a1bb8c6b7bc3f9d817f9ce207
 EBUILD vlc-3.0.9999.ebuild 13019 BLAKE2B 6331fcc72c164b70a82240811e65c43cdb76e0a1646ea15d9446ece6d6174688b5bfaa68e3a8171dfe237c95c9cecf93107ed2c8e942915938ff1745f523f149 SHA512 4311201b2966d3013ee195083ab22bc7b8a06bcfec190e02f54cb62f07a7d42b7a3c5f65a38bbd67450edf111d5692740f151cd1aa322aa226f550f08f7db943
 EBUILD vlc-9999.ebuild 12900 BLAKE2B bcc4c8ec26fb90538d98399a466fd6cec60b3abc0ef74a485c6e46e699d9f7248d85e14154837ed4bf53c64206936ff1dc5aeb798d14f19bc363c9eb13fa34f0 SHA512 a1ad27c395f7549ab5e0530272984d4e709ac5fb4f481ac22348617fce9fcdd2e677abe4aa9869afbeb07ed9a743433767195c8d077cbe163c9964cb5cb4978d
 MISC metadata.xml 4746 BLAKE2B 797c2f7c113915fe8e1508eef1a110db4c7717fa0ee5bfdd49c4260532be2929b6551a453a79c08aa9a6e62f109396778ce9efc823eb18db2bf25f3e9db10068 SHA512 49828ab8f168e49210c7c259b7c0242f9c68bfc9fa9151e5663a8dea781d34f40a6cb22e354332b9efba0610b70995b511ffef20b844914d0dea0118251905b8
diff --git a/media-video/vlc/vlc-3.0.8-r1.ebuild b/media-video/vlc/vlc-3.0.8-r1.ebuild
deleted file mode 100644
index bdfb4ef11006..000000000000
--- a/media-video/vlc/vlc-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 2000-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	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"
-fi
-inherit autotools flag-o-matic toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass 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_x86_mmx cpu_flags_x86_sse
-"
-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 )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-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 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${P}-qt-5.15.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable altivec)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-macosx-qtkit
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 34ee783f3a7d..902d5e19101d 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 c2cfabb46057..8dcb011319b0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2020 19:38:19 +0000
+Fri, 15 May 2020 15:08:22 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4048abd19630..42c744a246cb 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 464298 BLAKE2B 526a6ba1147d1a7dfd302a24bff7fbcd35795c074c66309f2769965fbf66a4030ab97ff6fe749f275ae27a9eb89af001a4da1c9034b77087136aaec3ef924db0 SHA512 9109f8b09544f23d56243b529abfacedcd6c96f06bd7ac30000b4fdc0fa196adcedd450a45aa34b2f3b9e39c5c79b21cf745580241e5a3dbd04444c94fd0e004
-TIMESTAMP 2020-05-13T19:38:22Z
+MANIFEST Manifest.files.gz 465570 BLAKE2B a62e99817e32fd8ff7f82db3f63ecd455d8d078254d12926bca9349cd7d4cb7525d19b5ca213653d7ca3a28e5f51b7e4f978944f6a7c39fec3994650ada13ff2 SHA512 ee24891578ae08c29634185ea42adbf62dff9fd502bd411c413a0b0088f0d305dd4dba72180ac6793f6d434a7cc1a30d883831d3d40443eae468994ac283a7ef
+TIMESTAMP 2020-05-15T15:08:25Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl68TK5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6+sGlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDF6A/9GJG/DrEcrPQAGOrn8KqxWbips5TnugsEHSCRP13aO1WWnd8kenCQM93G
-lB/cvcY3bkJuaevASDHB84JSTulP54OxXyOtDmqxMzOCgDm02z737NO/0XFnGEWm
-jSwOuojG+ts0eMB98hxfwEkzUGEZZ0eINIjQhMgoMeeJE/3L8xPgT8mj9sB2g5C1
-XjhfYYG0gJeId7G/nFAlHbMo/M17bfB8WtLy9azQ8+xpWZ9ea0QRasVpz3YtG0h8
-nWASjpt/F9O3AAfzqjBdeUh46crxF+Z3+N5H/Cic7eZ/hVvC06nXngBOajKFpcmX
-XJ1iLsKmdCeK/4hATmKmj36ENAUirLNc/YBltbszhkf7aTxk4+DRITJsYEQu5FPE
-mi4T6LLLKAkBNoKpUysFCQ5Z25RxxfiW/OF5bNwaJIvlO/oZuwTl42OaX3sdIqmA
-gluNXcScwr4yjekLYEYUI66se+By1f3VfIwuPJ6Oc4aW52V/PQQT4NyEnpZ3uSDD
-0Yp6xd2Win43qDCjQGM5zxmv8e4Jm81Yvi6YP4teBBcIXQWfRxaLh/BV7gTwp5Ts
-Bx+BnTIUWkzi+rcKbPdGWvHzZo9KV1QEEqGS7TkGFk9Qa1qSDa9EvCPh70QNEeVu
-MeqxjZh45590PBC4QrEvRE76l70o4gxxVu+SguMQs0OBRDUJxrU=
-=JTdm
+klAdPw//Vje76+n1VKipLrkgvusg5/LOoej8A/DZecPKS7S0+IMXbKAmVLhF1byJ
+IZreLK+2sU1X3DpNM3k7mBydeyTnTkBd++cICqmAtBTO/xuH1Rbi1DkNMOGsP3Pm
+BfxgXnqIV3eZEyyuSzqWLu4pzF03CRUdBR/4DS8ZAqM6Ed0PsPEygfGTZefZXV7j
+BrrshJg7iKEkM1r/qiw56z/FXHoqSj5lI8684QaELQQL0of7MtRGzIy9GT/gIPns
+W4BvcrRHjXAzPRK1lw5Lbw6pLfNl86LMOwhki9lt3I+6O6/lktwvKs1ctnoRe0yn
+ZgLFwl+jv2ArnyA9IzqIfaMUaR+ZDTxyToj270rLuiFOL8rH6tKQJx8SnEPFev8k
+jj8fSpSH2rh7T+gEBRWR5iBmR5G6tkP+q6zWrRpRzviu6TiNZHnSSubo99hi1Oxi
+d5xvzJ4Gci3EF55sFdCOiRclIOkmkVN/CxubfW9RTCyPVgiPYP/AhiwphYNiWzLx
+FbV5CU71Z237SZ4T91d/m1QeKlWhy+/+JSa2Ykg5Fe+5C8KLVGnpPlI/rgSQUVL7
+oXqY7njO+VCadlIaoIBRMfjuVH5vdc8hXV1pHcqqGURWNGrHz3IV2bSdhuS/CFJx
+/AskLvZIkC9v68XVM+Ozmt3fgT3SsBlrxAtVdC0+kAR+KfcYWUI=
+=9JAn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 1ff792f048e2..192d458f15e0 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202005-06.xml b/metadata/glsa/glsa-202005-06.xml
new file mode 100644
index 000000000000..47af68376869
--- /dev/null
+++ b/metadata/glsa/glsa-202005-06.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-06">
+  <title>LIVE555 Media Server: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in LIVE555 Media Server,
+    the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">live555</product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>669276</bug>
+  <bug>677276</bug>
+  <bug>717722</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-plugins/live" auto="yes" arch="*">
+      <unaffected range="ge">2020.03.06</unaffected>
+      <vulnerable range="lt">2020.03.06</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>LIVE555 Media Server is a set of libraries for multimedia streaming.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in LIVE555 Media Server.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All LIVE555 Media Server users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-plugins/live-2020.03.06"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-4013">CVE-2018-4013</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-15232">CVE-2019-15232</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-6256">CVE-2019-6256</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7314">CVE-2019-7314</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7733">CVE-2019-7733</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-9215">CVE-2019-9215</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-04T11:34:40Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:04:59Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-07.xml b/metadata/glsa/glsa-202005-07.xml
new file mode 100644
index 000000000000..e62478b0c37c
--- /dev/null
+++ b/metadata/glsa/glsa-202005-07.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-07">
+  <title>FreeRDP: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in FreeRDP, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">freerdp</product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>716830</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/freerdp" auto="yes" arch="*">
+      <unaffected range="ge">2.1.0</unaffected>
+      <vulnerable range="lt">2.1.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>FreeRDP is a free implementation of the Remote Desktop Protocol.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in FreeRDP. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could possibly cause a Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All FreeRDP users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-misc/freerdp-2.1.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-17177">CVE-2019-17177</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11521">CVE-2020-11521</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11522">CVE-2020-11522</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11523">CVE-2020-11523</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11524">CVE-2020-11524</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11525">CVE-2020-11525</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11526">CVE-2020-11526</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-04T02:51:48Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:10:55Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-08.xml b/metadata/glsa/glsa-202005-08.xml
new file mode 100644
index 000000000000..3e9aa4a0b5cf
--- /dev/null
+++ b/metadata/glsa/glsa-202005-08.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-08">
+  <title>Xen: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Xen, the worst of which
+    could allow privilege escalation.
+  </synopsis>
+  <product type="ebuild">xen</product>
+  <announced>2020-05-14</announced>
+  <revised count="2">2020-05-15</revised>
+  <bug>717446</bug>
+  <access>local</access>
+  <affected>
+    <package name="app-emulation/xen" auto="yes" arch="*">
+      <unaffected range="ge">4.12.2-r2</unaffected>
+      <vulnerable range="lt">4.12.2-r2</vulnerable>
+    </package>
+    <package name="app-emulation/xen-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.12.2-r1</unaffected>
+      <vulnerable range="lt">4.12.2-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Xen is a bare-metal hypervisor.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Xen. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Xen users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.12.2-r2"
+    </code>
+    
+    <p>All Xen Tools users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/xen-tools-4.12.2-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11739">CVE-2020-11739</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11740">CVE-2020-11740</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11741">CVE-2020-11741</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11742">CVE-2020-11742</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-11743">CVE-2020-11743</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-04T11:20:31Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-15T12:42:31Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-09.xml b/metadata/glsa/glsa-202005-09.xml
new file mode 100644
index 000000000000..332036b90775
--- /dev/null
+++ b/metadata/glsa/glsa-202005-09.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-09">
+  <title>Python: Denial of Service</title>
+  <synopsis>A vulnerability in Python could lead to a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">python</product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>707822</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-lang/python" auto="yes" arch="*">
+      <unaffected range="ge" slot="2.7">2.7.18</unaffected>
+      <unaffected range="ge" slot="3.6">3.6.10-r2</unaffected>
+      <unaffected range="ge" slot="3.7">3.7.7-r2</unaffected>
+      <unaffected range="ge" slot="3.8">3.8.2-r2</unaffected>
+      <vulnerable range="lt" slot="2.7">2.7.18</vulnerable>
+      <vulnerable range="lt" slot="3.6">3.6.10-r2</vulnerable>
+      <vulnerable range="lt" slot="3.7">3.7.7-r2</vulnerable>
+      <vulnerable range="lt" slot="3.8">3.8.2-r2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Python is an interpreted, interactive, object-oriented programming
+      language.
+    </p>
+  </background>
+  <description>
+    <p>An issue was discovered in urllib.request.AbstractBasicAuthHandler which
+      allowed a remote attacker to send malicious data causing extensive
+      regular expression backtracking.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could cause a possible Denial of Service condition.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Python 2.7 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-2.7.18:2.7"
+    </code>
+    
+    <p>All Python 3.6 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.6.10-r2:3.6"
+    </code>
+    
+    <p>All Python 3.7 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.7.7-r2:3.7"
+    </code>
+    
+    <p>All Python 3.8 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.8.2-r2:3.8"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-8492">CVE-2020-8492</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-07T23:04:03Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:18:15Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-10.xml b/metadata/glsa/glsa-202005-10.xml
new file mode 100644
index 000000000000..67732b5149b0
--- /dev/null
+++ b/metadata/glsa/glsa-202005-10.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-10">
+  <title>libmicrodns: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libmicrodns, the worst
+    of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">libmicrodns</product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>714606</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/libmicrodns" auto="yes" arch="*">
+      <unaffected range="ge">0.1.2</unaffected>
+      <vulnerable range="lt">0.1.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libmicrodns is an mDNS library, focused on being simple and
+      cross-platform.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libmicrodns. Please
+      review the CVE identifiers and the upstream advisory referenced below for
+      details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libmicrodns users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-libs/libmicrodns-0.1.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6071">CVE-2020-6071</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6072">CVE-2020-6072</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6073">CVE-2020-6073</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6077">CVE-2020-6077</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6078">CVE-2020-6078</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6079">CVE-2020-6079</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6080">CVE-2020-6080</uri>
+    <uri link="https://www.videolan.org/security/sb-vlc309.html">
+      VideoLAN-SB-VLC-309
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-13T00:35:54Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:21:44Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-11.xml b/metadata/glsa/glsa-202005-11.xml
new file mode 100644
index 000000000000..226bfcdfbd19
--- /dev/null
+++ b/metadata/glsa/glsa-202005-11.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-11">
+  <title>VLC: Buffer overflow</title>
+  <synopsis>A buffer overflow in VLC might allow local or remote attacker(s) to
+    execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">vlc</product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>721940</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="media-video/vlc" auto="yes" arch="*">
+      <unaffected range="ge">3.0.10</unaffected>
+      <vulnerable range="lt">3.0.10</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>VLC is a cross-platform media player and streaming server.</p>
+  </background>
+  <description>
+    <p>A buffer overflow in DecodeBlock in sdl_image.c was discovered.</p>
+  </description>
+  <impact type="normal">
+    <p>A remote user could craft a specifically crafted image file that could
+      execute arbitrary code or cause denial of service.
+    </p>
+  </impact>
+  <workaround>
+    <p>The user should refrain from opening files from untrusted third parties
+      or accessing untrusted remote sites (or disable the VLC browser plugins),
+      until they upgrade.
+    </p>
+  </workaround>
+  <resolution>
+    <p>All VLC users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-video/vlc-3.0.10"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-19721">CVE-2019-19721</uri>
+    <uri link="https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=72afe7ebd8305bf4f5360293b8621cde52ec506b">
+      Upstream patch
+    </uri>
+    <uri link="https://www.videolan.org/security/sb-vlc309.html">
+      VideoLAN-SB-VLC-309
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-12T16:12:42Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:24:24Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202005-12.xml b/metadata/glsa/glsa-202005-12.xml
new file mode 100644
index 000000000000..d13126864e2d
--- /dev/null
+++ b/metadata/glsa/glsa-202005-12.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-12">
+  <title>OpenSLP: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in OpenSLP, the worst of
+    which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">openslp</product>
+  <announced>2020-05-14</announced>
+  <revised count="2">2020-05-14</revised>
+  <bug>662878</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-misc/openslp" auto="yes" arch="*">
+      <vulnerable range="le">2.0.0-r5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>OpenSLP is an open-source implementation of Service Location Protocol
+      (SLP).
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in OpenSLP. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for OpenSLP. We recommend that users
+      unmerge OpenSLP:
+      <code>
+        # emerge --unmerge "net-libs/openslp"
+      </code>
+      
+      <p>NOTE: The Gentoo developer(s) maintaining OpenSLP have discontinued
+        support at this time. It may be possible that a new Gentoo developer
+        will update OpenSLP at a later date. No known alternatives to OpenSLP
+        are in the tree at this time.
+      </p>
+    </p>
+    </resolution>
+    <references>
+      <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-17833">
+        CVE-2017-17833
+      </uri>
+      <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-5544">CVE-2019-5544</uri>
+    </references>
+    <metadata tag="requester" timestamp="2020-05-13T01:13:11Z">sam_c</metadata>
+    <metadata tag="submitter" timestamp="2020-05-14T22:31:01Z">sam_c</metadata>
+  </glsa>
diff --git a/metadata/glsa/glsa-202005-13.xml b/metadata/glsa/glsa-202005-13.xml
new file mode 100644
index 000000000000..bbaac528c32a
--- /dev/null
+++ b/metadata/glsa/glsa-202005-13.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202005-13">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>2020-05-14</announced>
+  <revised count="1">2020-05-14</revised>
+  <bug>719902</bug>
+  <bug>721310</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">81.0.4044.138</unaffected>
+      <vulnerable range="lt">81.0.4044.138</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">81.0.4044.138</unaffected>
+      <vulnerable range="lt">81.0.4044.138</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-81.0.4044.138"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-81.0.4044.138"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6461">CVE-2020-6461</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6462">CVE-2020-6462</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6464">CVE-2020-6464</uri>
+    <uri link="https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_27.html">
+      Release notes (81.0.4044.129)
+    </uri>
+    <uri link="https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html">
+      Release notes (81.0.4044.138)
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-05-13T00:58:25Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-05-14T22:35:22Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c2cfabb46057..8dcb011319b0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2020 19:38:19 +0000
+Fri, 15 May 2020 15:08:22 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 42d3e919a17e..1e05047643a2 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-87a3185d1d1560e7d00df11c54ac0f9e63c64368 1589326875 2020-05-12T23:41:15+00:00
+8f997a18382e6fd1fe9722aff738fb088141123c 1589546660 2020-05-15T12:44:20+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e6953029088f..aecfcd290f46 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 a111be1c72d3..2c56a751ce2e 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/lxd-0 b/metadata/md5-cache/acct-group/lxd-0
new file mode 100644
index 000000000000..ba58fe30dd29
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lxd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=Group for app-emulation/lxd
+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_=4e17f1595d1bd56d16a02fbb18c9afff
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 19af77e5ec70..9700ef79c006 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/ansible-2.9.9 b/metadata/md5-cache/app-admin/ansible-2.9.9
new file mode 100644
index 000000000000..79b8e8631c3c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.9.9
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.9.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7346e88dbf323145c7725aa867b6caef
diff --git a/metadata/md5-cache/app-admin/gopass-1.9.2 b/metadata/md5-cache/app-admin/gopass-1.9.2
new file mode 100644
index 000000000000..ff6f87150fe1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gopass-1.9.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=install postinst unpack
+DEPEND=>=dev-lang/go-1.11
+DESCRIPTION=a simple but powerful password manager for the terminal
+EAPI=7
+HOMEPAGE=https://www.gopass.pw/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
+RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/gopasspw/gopass/archive/v1.9.2.tar.gz -> gopass-1.9.2.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.3.3.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/!proton!mail/go-appdir/@v/v1.1.0.zip -> github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!proton!mail/go-appdir/@v/v1.1.0.mod -> github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.zip -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip mirror://goproxy//github.com/alecthomas/binary/@v/v0.0.0-20190922233330-fb1b1d9c299c.mod -> github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.2.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip mirror://goproxy//github.com/blang/semver/@v/v0.0.0-20190414182527-1a9109f8c4a1.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.2.zip -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dominikschulz/github-releases/@v/v0.0.2.mod -> github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/doronbehar/gocui/@v/v0.4.2.zip -> github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/doronbehar/gocui/@v/v0.4.2.mod -> github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/doronbehar/termbox-go/@v/v0.0.0-20191006141301-8c9470559e05.zip -> github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip mirror://goproxy//github.com/doronbehar/termbox-go/@v/v0.0.0-20191006141301-8c9470559e05.mod -> github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.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/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.zip -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gdamore/tcell/@v/v1.3.0.mod -> github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.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/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-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.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20160922125227-76804708ecad.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.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/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.2.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/lucasb-eyer/go-colorful/@v/v1.0.3.mod -> github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.0.0-20190331205820-7dc3d102eca3.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.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-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-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/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/muesli/goprogressbar/@v/v0.0.0-20190807022807-e540249d2ac1.zip -> github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip mirror://goproxy//github.com/muesli/goprogressbar/@v/v0.0.0-20190807022807-e540249d2ac1.mod -> github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/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/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/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.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/skip2/go-qrcode/@v/v0.0.0-20191027152451-9434209cb086.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20191027152451-9434209cb086.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.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/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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/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-20200421231249-e086a090c8fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200421231249-e086a090c8fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.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-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.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.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/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/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/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//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-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/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.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//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	cca12a5688562f107c14ffcf28195dd7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=092d6a62dd93c5056470d5a47a78275a
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.4 b/metadata/md5-cache/app-admin/salt-2019.2.5
similarity index 57%
rename from metadata/md5-cache/app-admin/salt-2019.2.4
rename to metadata/md5-cache/app-admin/salt-2019.2.5
index 26ec65066b84..2b7f7773e907 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.4
+++ b/metadata/md5-cache/app-admin/salt-2019.2.5
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/boto-2.32.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/moto-0.3.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-helpers-namespace[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-salt-2018.12.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-apps/pciutils dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/msgpack-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/boto-2.32.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/moto-0.3.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-helpers-namespace[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-salt-2018.12.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/pytest-salt-2020.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-apps/pciutils dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/msgpack-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
@@ -10,6 +10,6 @@ RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python3_6(-)?,-python_
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2019.2.4.tar.gz
+SRC_URI=mirror://pypi/s/salt/salt-2019.2.5.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f43c20fe4b71a62f18b691a0320b48b5
+_md5_=c43e42eb15923fc7a7dc9601556c2093
diff --git a/metadata/md5-cache/app-admin/salt-3000.3 b/metadata/md5-cache/app-admin/salt-3000.3
new file mode 100644
index 000000000000..3637ea594a3c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-3000.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( sys-apps/pciutils dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libnacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/msgpack-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/msgpack-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mako? ( dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) libvirt? ( python_targets_python3_7? ( dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ioflo-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/raet-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cheetah? ( dev-python/cheetah3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mongodb? ( dev-python/pymongo[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) portage? ( sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) keyring? ( dev-python/keyring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) redis? ( dev-python/redis-py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_7? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) neutron? ( python_targets_python3_7? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) profile? ( dev-python/yappi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/boto-2.32.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/libcloud-0.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mock-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/moto-0.3.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-helpers-namespace[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-helpers-namespace[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-salt-2018.12.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-tempdir[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ) virtual/pkgconfig python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=7
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libnacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/msgpack-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/msgpack-1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markupsafe[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mako? ( dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) libvirt? ( python_targets_python3_7? ( dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ioflo-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/raet-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) cheetah? ( dev-python/cheetah3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mongodb? ( dev-python/pymongo[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) portage? ( sys-apps/portage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) keyring? ( dev-python/keyring[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) redis? ( dev-python/redis-py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_7? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) neutron? ( python_targets_python3_7? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) profile? ( dev-python/yappi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test ) x86? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/salt/salt-3000.3.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=270ffa157a1588bf497076c71fffc8ca
diff --git a/metadata/md5-cache/app-admin/sysklogd-2.1.2 b/metadata/md5-cache/app-admin/sysklogd-2.1.2
index 288c1cdb4d3f..b478f7104831 100644
--- a/metadata/md5-cache/app-admin/sysklogd-2.1.2
+++ b/metadata/md5-cache/app-admin/sysklogd-2.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Standard log daemons
 EAPI=7
 HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
 IUSE=logger logrotate systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.1.2/sysklogd-2.1.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3aaa112d2a5d3776bc9a0c8feda5eb0e
+_md5_=e33c8628f9d697f6a73c38d4964458c2
diff --git a/metadata/md5-cache/app-admin/terraform-0.12.25 b/metadata/md5-cache/app-admin/terraform-0.12.25
new file mode 100644
index 000000000000..1d043e9b1c0b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-0.12.25
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=7
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v0.12.25.tar.gz -> terraform-0.12.25.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1-0.20191028180845-3492b2aff503.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1-0.20191028180845-3492b2aff503.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod mirror://goproxy//github.com/!qcloud!api/qcloud_sign_golang/@v/v0.0.0-20141224014652-e4130a326409.mod -> github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod mirror://goproxy//github.com/!unknwon/com/@v/v0.0.0-20151008135407-28b053d5a292.zip -> github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.zip mirror://goproxy//github.com/!unknwon/com/@v/v0.0.0-20151008135407-28b053d5a292.mod -> github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.1.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.zip -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20150830182803-278e1ec8e8a6.zip -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.zip mirror://goproxy//github.com/agl/ed25519/@v/v0.0.0-20150830182803-278e1ec8e8a6.mod -> github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.zip -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.mod -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.zip -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.mod -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.0.1.zip -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.0.1.mod -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20180507223929-23540a00eaa3.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.zip -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apparentlymart/go-versions/@v/v0.0.2-0.20180815153302-64b99f7cb171.zip -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.zip mirror://goproxy//github.com/apparentlymart/go-versions/@v/v0.0.2-0.20180815153302-64b99f7cb171.mod -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.3.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.3.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.12.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.12.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.zip -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.mod -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.0.zip -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.0.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180920040454-5637cf3d8a31.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v0.0.0-20180920040454-5637cf3d8a31.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.zip -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.mod -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.zip -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.mod -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190208042652-bc37892e1968.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190208042652-bc37892e1968.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.mod mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20190128072930-fbb6ab446f01.zip -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.zip mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20190128072930-fbb6ab446f01.mod -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.zip -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.mod -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.4.2-0.20200106182914-9813cbd4eb02.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.4.2-0.20200106182914-9813cbd4eb02.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20181001195459-61d530d6c27f.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20181001195459-61d530d6c27f.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1-0.20190610192547-a1bc61569a26.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1-0.20190610192547-a1bc61569a26.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.3.27.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.3.27.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.3.0.zip -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.3.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20190212112733-ab17b08d6590.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20190212112733-ab17b08d6590.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.zip -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.zip mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20191212124732-c6ae6269b9d7.mod -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.mod mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20191011084731-65d371908596.zip -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.zip mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20191011084731-65d371908596.mod -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.mod mirror://goproxy//github.com/hashicorp/vault/@v/v0.10.4.zip -> github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/hashicorp/vault/@v/v0.10.4.mod -> github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20161004153544-93f5b35093ba.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20161004153544-93f5b35093ba.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.zip -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.zip -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.mod -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20190223112901-5e5c9a7fe54b.zip -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.zip mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20190223112901-5e5c9a7fe54b.mod -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.zip -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.mod -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v0.0.0-20150314170334-ad45545899c7.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.zip -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.zip mirror://goproxy//github.com/mitchellh/prefixedio/@v/v0.0.0-20190213213902-5733675afd51.mod -> github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.zip -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.mod -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.zip -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.mod -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180102160824-81144009af58.zip -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.zip mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180102160824-81144009af58.mod -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.mod mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.zip -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.mod -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod mirror://goproxy//github.com/terraform-providers/terraform-provider-openstack/@v/v1.15.0.zip -> github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip mirror://goproxy//github.com/terraform-providers/terraform-provider-openstack/@v/v1.15.0.mod -> github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20171017195756-830351dc03c6.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20180813092308-00b869d2f4a5.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v4.0.1+incompatible.zip -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.zip mirror://goproxy//github.com/vmihailenco/msgpack/@v/v4.0.1+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20160813154853-07dd2e8dfe18.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.0.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.1.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.1.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.1.zip -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.1.mod -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190222235706-ffb98f73852f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180811021610-c39426892332.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190804053845-51ab0e2deafa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190804053845-51ab0e2deafa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7
+_md5_=28677dc066c4264340b49210281a62e3
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 7d9b8461a011..cc469e8974e4 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/arc-5.21p b/metadata/md5-cache/app-arch/arc-5.21p
index 5d208bb21628..fc440df1809c 100644
--- a/metadata/md5-cache/app-arch/arc-5.21p
+++ b/metadata/md5-cache/app-arch/arc-5.21p
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arc/arc-5.21p.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a39da3950358c4a24e1007ffd50fcfe7
+_md5_=6423cacd9c1c4844ce6b0f1a9ea193ca
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 98eb393c6c63..a5a36ee0e343 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.6 b/metadata/md5-cache/app-backup/bareos-17.2.6
deleted file mode 100644
index bada8165f8cf..000000000000
--- a/metadata/md5-cache/app-backup/bareos-17.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/pkgconfig
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=6
-HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.6.tar.gz -> bareos-17.2.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2f76ac9b392f2e14f31237cdf27aa7a
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.7-r1 b/metadata/md5-cache/app-backup/bareos-17.2.7-r1
deleted file mode 100644
index a2508cfae470..000000000000
--- a/metadata/md5-cache/app-backup/bareos-17.2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/pkgconfig
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=6
-HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.7.tar.gz -> bareos-17.2.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72cea6ce000ed80263c8e076fc356768
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.9 b/metadata/md5-cache/app-backup/bareos-17.2.9
new file mode 100644
index 000000000000..967472283843
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-17.2.9
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=http://www.bareos.org/
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.9.tar.gz -> bareos-17.2.9.tar.gz
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fb5996469466276a5940d1e537ab0884
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.6 b/metadata/md5-cache/app-backup/bareos-18.2.6
deleted file mode 100644
index 7d77db6dae6a..000000000000
--- a/metadata/md5-cache/app-backup/bareos-18.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=6
-HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.6.tar.gz -> bareos-18.2.6.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fefcd7ecec39df66f464ea6d4bb0fb13
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.8 b/metadata/md5-cache/app-backup/bareos-18.2.8
new file mode 100644
index 000000000000..0faf71366889
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-18.2.8
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=http://www.bareos.org/
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.8.tar.gz -> bareos-18.2.8.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=858e9c324ad3acbeb85cb3b6ec7a2d90
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.7 b/metadata/md5-cache/app-backup/bareos-19.2.7
new file mode 100644
index 000000000000..d05e15dcb654
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-19.2.7
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.7.tar.gz -> bareos-19.2.7.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aa7682a34d9a7c1c427810f295c41139
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 794957399560..7e38ed0a44fd 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/cuecue-0.2.2-r3 b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
new file mode 100644
index 000000000000..b4b5e7957784
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis media-libs/libogg )
+DESCRIPTION=Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=flac mp3 +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis media-libs/libogg )
+REQUIRED_USE=|| ( flac mp3 vorbis )
+SLOT=0
+SRC_URI=mirror://gentoo/cuecue-0.2.2.tar.gz
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b417e7677ca2644d76ce77489c35625e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 88b407fb1c1f..d71eb1f15e25 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/shed-1.15 b/metadata/md5-cache/app-editors/shed-1.15
index 40d729b23f5a..5f01bdc75671 100644
--- a/metadata/md5-cache/app-editors/shed-1.15
+++ b/metadata/md5-cache/app-editors/shed-1.15
@@ -1,5 +1,6 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Simple Hex EDitor
 EAPI=7
 HOMEPAGE=http://shed.sourceforge.net/
@@ -9,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/shed/shed-1.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=46a96af7b8f7b149a7faee5cc5029174
+_md5_=5839976db81502fa68ccc525dcd60865
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index c4f6a3f7df74..1d2b174d051f 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/lxc-4.0.1 b/metadata/md5-cache/app-emulation/lxc-4.0.1
new file mode 100644
index 000000000000..65cd33d3c522
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/pax-utils net-libs/gnutls sys-apps/util-linux sys-libs/libcap virtual/awk pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2 apparmor? ( sys-apps/apparmor )
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
+IUSE=apparmor examples pam seccomp selinux +templates kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+PDEPEND=templates? ( app-emulation/lxc-templates )
+RDEPEND=app-misc/pax-utils net-libs/gnutls sys-apps/util-linux sys-libs/libcap virtual/awk pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4ca3073b115137fd3b4d9013071ed94b
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.4 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
new file mode 100644
index 000000000000..8ba0210198d4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=app-emulation/lxc-3.0
+DESCRIPTION=Old style template scripts for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc-templates
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=app-emulation/lxc-3.0
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.4.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e2da1e348cf41562abde14c27ed408e5
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.1 b/metadata/md5-cache/app-emulation/lxd-4.0.1
new file mode 100644
index 000000000000..5c5eb4e0df84
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[seccomp] dev-lang/tcl dev-libs/libuv dev-libs/lzo net-dns/dnsmasq[dhcp,ipv6?]
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
+IUSE=+ipv6 nls kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
+RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[seccomp] dev-lang/tcl dev-libs/libuv dev-libs/lzo net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:0= sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=167006d9b6fa845b26c7bc7cf977521e
diff --git a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4 b/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
index af1aed66dfc7..09989b0f7e5f 100644
--- a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
+++ b/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
@@ -7,4 +7,4 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!app-emulation/qemu[qemu_user_targets_riscv64]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qemu-riscv64-bin-3.1.0-r4.tar.xz
-_md5_=ac0b1d2d6bce2b99cf522e39fee7b46d
+_md5_=661e9c1aa3735c7bffc016e1794bccee
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6ca82ecd50f9..94889946b606 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-anthy-1.5.10-r1 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
similarity index 88%
rename from metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1
rename to metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
index ba2396b2c247..e3d6824753fd 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
@@ -1,6 +1,6 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/anthy 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(-)] ) nls? ( virtual/libintl )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/anthy 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(-)] ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Japanese Anthy engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.10/ibus-anthy-1.5.10.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b31d11ed8e16db3f9ec05b8512698f0
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8590ced030f4b36d57daf4f318036cfa
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
similarity index 89%
rename from metadata/md5-cache/app-i18n/ibus-anthy-1.5.11
rename to metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
index d6e921437881..0302e20dc79f 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+BDEPEND=virtual/pkgconfig sys-devel/gettext
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/anthy 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(-)] ) nls? ( virtual/libintl )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-i18n/anthy 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(-)] ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Japanese Anthy engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/releases/download/1.5.11/ibus-anthy-1.5.11.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84a18b9526589d170e9845a0a66a6542
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cf84cea175d3196cf6953a542558068c
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.4 b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
deleted file mode 100644
index 8fb878b05a65..000000000000
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A command line interface for Transifex
-EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=test python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf57a85be8a4ec23c377aaf36e5c2c15
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e80294a65678..fd54c5faf939 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/libreoffice-6.4.3.2 b/metadata/md5-cache/app-office/libreoffice-6.4.3.2
index d591cf2bad11..efb4c16ffb44 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.4.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.3.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.4.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.3//libreoffice-6.4.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.3//libreoffice-help-6.4.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.3.2/src/libreoffice-6.4.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.3.2/src/libreoffice-help-6.4.3.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e21615d1d01948381125f3b078ec67d
+_md5_=5b126a375fba50f66fece14dbb29b69a
diff --git a/metadata/md5-cache/app-office/unoconv-0.9.0 b/metadata/md5-cache/app-office/unoconv-0.9.0
index f6c51eb9c52a..207b2a1f17a9 100644
--- a/metadata/md5-cache/app-office/unoconv-0.9.0
+++ b/metadata/md5-cache/app-office/unoconv-0.9.0
@@ -3,11 +3,11 @@ DESCRIPTION=Convert between document formats supported by LibreOffice
 EAPI=7
 HOMEPAGE=http://dag.wiee.rs/home-made/unoconv/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-text/odt2txt virtual/ooo
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/unoconv/archive/0.9.0.tar.gz -> unoconv-0.9.0.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70433f2e71100356e5087cfb0c2be7eb
+_md5_=4beaf54862e91fa6c21287887f0dc7e4
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 08aad592e123..d6f31cf884ad 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/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
index 390693392247..c2a759f484bf 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90660f768bea1dd0c37ac0409070ff58
+_md5_=87e56bcd536f11399b7987b3d8dd9947
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.87 b/metadata/md5-cache/app-portage/portage-utils-0.87
index cde0c4e2106f..37270c02b81e 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.87
+++ b/metadata/md5-cache/app-portage/portage-utils-0.87
@@ -4,9 +4,9 @@ DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static openmp +qmanifest +qtegrity libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.87.tar.xz
-_md5_=10c31a224a10af3193b1911e6d615923
+_md5_=192fa18f8a61412af310a6376e544fe6
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5b9e373d07fa..f5c8684a7b04 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/calibre-4.16.0 b/metadata/md5-cache/app-text/calibre-4.16.0
new file mode 100644
index 000000000000..576ecaab4d90
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-4.16.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] dev-python/zeroconf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] dev-python/zeroconf[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/4.16.0/calibre-4.16.0.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d1075d8d038c665be29a80f8de6bb5d0
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
index aa7ccd9936b5..8a1e5b3291db 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to convert docbook to man and info
 EAPI=5
 HOMEPAGE=http://docbook2x.sourceforge.net/
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24eec08c58c73b3af61e0bdf270a893c
+_md5_=a4b47b8a0665a5beaff2217f86e26a43
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.9-r1 b/metadata/md5-cache/app-text/libetonyek-0.1.9-r1
index dd4e7167663e..c26d0b1c658a 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.9-r1
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.9-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.9.tar.xz
-_md5_=5b163cc1da08371076668831a69490b4
+_md5_=67a1dc34c081826d98a5445919c0173f
diff --git a/metadata/md5-cache/app-text/poppler-0.88.0 b/metadata/md5-cache/app-text/poppler-0.88.0-r1
similarity index 97%
rename from metadata/md5-cache/app-text/poppler-0.88.0
rename to metadata/md5-cache/app-text/poppler-0.88.0-r1
index 720f584e6db2..03fa1663c4cb 100644
--- a/metadata/md5-cache/app-text/poppler-0.88.0
+++ b/metadata/md5-cache/app-text/poppler-0.88.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/99
 SRC_URI=https://poppler.freedesktop.org/poppler-0.88.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5fde990671da55b0617c622ee18a76f4
+_md5_=e00ecd902490570eb3626289623611ac
diff --git a/metadata/md5-cache/app-text/recode-3.7.6 b/metadata/md5-cache/app-text/recode-3.7.6
new file mode 100644
index 000000000000..0cb105c8cec2
--- /dev/null
+++ b/metadata/md5-cache/app-text/recode-3.7.6
@@ -0,0 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex
+DESCRIPTION=Convert files between various character sets
+EAPI=7
+HOMEPAGE=https://github.com/rrthomas/recode
+IUSE=nls static-libs
+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 ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.6/recode-3.7.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4d57ad202d2519b5e3e62dd902de51a4
diff --git a/metadata/md5-cache/app-text/recode-3.7_pre20140303 b/metadata/md5-cache/app-text/recode-3.7_pre20140303
deleted file mode 100644
index 8d3753376005..000000000000
--- a/metadata/md5-cache/app-text/recode-3.7_pre20140303
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-devel/flex nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Convert files between various character sets
-EAPI=6
-HOMEPAGE=https://github.com/rrthomas/recode
-IUSE=nls static-libs
-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 ~x86-solaris
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/pinard/Recode/archive/2d7092a9999194fc0e9449717a8048c8d8e26c18.tar.gz -> recode-3.7_pre20140303.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ada0a1c380c0fa6c7316508faca60b44
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index f3f9f942327c..cde652581dec 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
index 9adc5b60b981..beeea8688eaf 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.7.3.tar.gz -> nlohmann_json-3.7.3.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67bc20622a701bca483c7650c1690423
+_md5_=6c92b9a43c61ff45fd47f0eb467ba17b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ee3bc3d8ed5e..bae21a276a1d 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.30 b/metadata/md5-cache/dev-db/mysql-5.7.30
index 4f6a2e034942..0cc09b86afae 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.30
+++ b/metadata/md5-cache/dev-db/mysql-5.7.30
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,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?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.30.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.30.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.30.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.30-patches-01.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9799d5786d28987197aa20ab5ade076f
+_md5_=1354594c0463cacb372cc94d7c8c4fcd
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.20 b/metadata/md5-cache/dev-db/mysql-8.0.20
index b0ac9feafa54..aee39d6bcec7 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.20
+++ b/metadata/md5-cache/dev-db/mysql-8.0.20
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 libressl numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.20.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.20-patches-01.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ed3eb8b4bebb1513326fec5901ca052
+_md5_=1e890dce8dcda69712083089e6b18797
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.1 b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
index 078cd32deb8a..ee714599ca5c 100644
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.1
+++ b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/pgmodeler/pgmodeler/archive/v0.9.1.tar.gz -> pgmodeler-0.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=014c1df6b0cb8ae5c13631df1a2afdfa
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.10 b/metadata/md5-cache/dev-db/pgpool2-3.7.10
index e5cde528409a..8d14b9f0d61a 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.10
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-3.7.10.tar.gz -> pgpool-II-3.7.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f60e01fcaefa5eb730775a25061a5a56
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.0.5 b/metadata/md5-cache/dev-db/pgpool2-4.0.5
index f0f2f7cbb640..9d4f155b20ae 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.0.5
+++ b/metadata/md5-cache/dev-db/pgpool2-4.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.0.5.tar.gz -> pgpool-II-4.0.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a49b69165ce4ae3b9e0455f26fc1641a
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index 101c4aa55244..ea0d76e2d575 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f3dba5c6f2950252ced240829047be57
diff --git a/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1 b/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
index a4dfc48cf962..6769ad45dc46 100644
--- a/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
+++ b/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v2.6.2.tar.gz -> pgrouting-2.6.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	0f69f5b2817c4dbd525e67890fdc86e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d08265b8f2bca6b66b95dd5fef03fc0d
diff --git a/metadata/md5-cache/dev-db/pgtap-0.99.0 b/metadata/md5-cache/dev-db/pgtap-0.99.0
index 7f51b5c78905..a7d699a1211f 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.99.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.99.0
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/0.99.0/pgtap-0.99.0.zip
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7c66065e1a538d264302ee86631ee445
diff --git a/metadata/md5-cache/dev-db/plr-8.3.0.17 b/metadata/md5-cache/dev-db/plr-8.3.0.17
index 9d0b03be6c74..dde3aadc263a 100644
--- a/metadata/md5-cache/dev-db/plr-8.3.0.17
+++ b/metadata/md5-cache/dev-db/plr-8.3.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server]
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_3_0_17.tar.gz -> plr-8.3.0.17.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7125d364b58700fde121f507ea563218
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.3-r1 b/metadata/md5-cache/dev-db/postgis-2.5.3-r1
index 42aca2d9b602..c3bf729c5b70 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.3-r1
+++ b/metadata/md5-cache/dev-db/postgis-2.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-2.5.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8af708b7e92ed7a07d1962aa557a0c2b
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.0-r1 b/metadata/md5-cache/dev-db/postgis-3.0.0-r1
index c1522d30159f..26c76386360a 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.0-r1
+++ b/metadata/md5-cache/dev-db/postgis-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1d8795abc4943a12a0e8f48f254b61ca
diff --git a/metadata/md5-cache/dev-db/postgis-9999 b/metadata/md5-cache/dev-db/postgis-9999
index a17688a48c91..1e835a0b2bba 100644
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_
 REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1d8795abc4943a12a0e8f48f254b61ca
diff --git a/metadata/md5-cache/dev-db/postgresql-10.13 b/metadata/md5-cache/dev-db/postgresql-10.13
new file mode 100644
index 000000000000..62a0ecda63fb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.13
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=10
+SRC_URI=https://ftp.postgresql.org/pub/source/v10.13/postgresql-10.13.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=12303a0e359a73f2e031af6d885d7998
diff --git a/metadata/md5-cache/dev-db/postgresql-11.8 b/metadata/md5-cache/dev-db/postgresql-11.8
new file mode 100644
index 000000000000..cb051f2a52ec
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-11.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=http://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=11
+SRC_URI=https://ftp.postgresql.org/pub/source/v11.8/postgresql-11.8.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ce3f522c075bd2c5ce6280a150884b03
diff --git a/metadata/md5-cache/dev-db/postgresql-12.3 b/metadata/md5-cache/dev-db/postgresql-12.3
new file mode 100644
index 000000000000..0461c57146d4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-12.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=http://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=12
+SRC_URI=https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3fcb46eae0a52d4cd6e3b94e9dd4d0aa
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.26 b/metadata/md5-cache/dev-db/postgresql-9.4.26
index 7fc79a7b50b1..0e3560abbdca 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.26
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.26
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerber
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.26/postgresql-9.4.26.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=fd06d32442c1ad42a4028bc7018fc0bb
+_md5_=a0faa3e517cbcd37c44c169704345f73
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.21 b/metadata/md5-cache/dev-db/postgresql-9.5.21
index 4b8902640772..343aa0462178 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.21
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.21
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerber
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.21/postgresql-9.5.21.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=5200b5881aac1d29762fd9d421d7ff3b
+_md5_=884e1a1f1abd81c682c74c8582f32ce1
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.22 b/metadata/md5-cache/dev-db/postgresql-9.5.22
new file mode 100644
index 000000000000..4244a5a53089
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.22
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=9.5
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.22/postgresql-9.5.22.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9e4ce41b15a4c1a9d9cbd0c8df88e637
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.17 b/metadata/md5-cache/dev-db/postgresql-9.6.17
index 608b984a880a..75459ef78ee9 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.17
@@ -4,7 +4,7 @@ DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerber
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.17/postgresql-9.6.17.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=10e7e8936fd9d661d4b6f3714f01661a
+_md5_=d081e125b5e81c965e88005edf06e1b8
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.18 b/metadata/md5-cache/dev-db/postgresql-9.6.18
new file mode 100644
index 000000000000..b3dabebb118a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.18
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=9.6
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.18/postgresql-9.6.18.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dc5fdbcdd371c66f45a2cf6ea7badd64
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index c4ae6ca114c7..d41a3df3f954 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux systemd ssl static-libs tcl threads uuid xml zlib l10n_af l10n_cs l10n_de l10n_en l10n_es l10n_fa l10n_fr l10n_hr l10n_hu l10n_it l10n_ko l10n_nb l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_tr l10n_zh-CN l10n_zh-TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 LICENSE=POSTGRESQL GPL-2
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:13 !dev-db/postgresql-base:13 !dev-db/postgresql-server:13 selinux? ( sec-policy/selinux-postgresql )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
-SLOT=13
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=c548e1793103404f866fb11e91299359
+SLOT=9999
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9702e8a9515aed6e1d107f3b05765caa
diff --git a/metadata/md5-cache/dev-db/redis-5.0.9 b/metadata/md5-cache/dev-db/redis-5.0.9
new file mode 100644
index 000000000000..d9596e7aab1c
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-5.0.9
@@ -0,0 +1,16 @@
+BDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) test? ( dev-lang/tcl:0= )
+DESCRIPTION=A persistent caching system, key-value and data structures database
+EAPI=7
+HOMEPAGE=https://redis.io
+IUSE=+jemalloc tcmalloc luajit test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis
+REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.redis.io/releases/redis-5.0.9.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f85b0beb45ad36d499e6d0917d97f456
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.6 b/metadata/md5-cache/dev-db/slony1-2.2.6
index 7bec62d95fd5..7622b188ec75 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.6
+++ b/metadata/md5-cache/dev-db/slony1-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.6.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.6-docs.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=935eda8f24203e33f9a42ceb58180704
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.7 b/metadata/md5-cache/dev-db/slony1-2.2.7
index 3a331cf72fdd..22da01791505 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.7
+++ b/metadata/md5-cache/dev-db/slony1-2.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server,threads] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server,threads] ) perl? ( dev-perl/DBD-Pg )
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.7.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.7-docs.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	0f69f5b2817c4dbd525e67890fdc86e2	postgres-multi	b784ac6c30437f2ded3f16482b56374c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f30a50965893866ec499e661508ad4cf
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ede5b70d66e1..fa858ea62339 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
new file mode 100644
index 000000000000..ecc9fcc91c6d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=app-arch/xz-utils >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.60.7:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/zlib-1.2.11-r2 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.2 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.32.0 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) selinux? ( sec-policy/selinux-java ) virtual/ttf-fonts !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1ac3cfd688f2b110e02efc8e161ae71
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
deleted file mode 100644
index 70ca9bd75751..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.53/src/apache-tomcat-8.5.53-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c72b057c284f2e143d5e59e9b106f917
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 7230ce85a865..d00de3a2097b 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/php-7.2.31 b/metadata/md5-cache/dev-lang/php-7.2.31
new file mode 100644
index 000000000000..5dc7230e0c95
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.31
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
+RESTRICT=!test? ( test )
+SLOT=7.2
+SRC_URI=https://www.php.net/distributions/php-7.2.31.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=054bbdb3ed9d16f362893ddfb089d443
diff --git a/metadata/md5-cache/dev-lang/php-7.3.18 b/metadata/md5-cache/dev-lang/php-7.3.18
new file mode 100644
index 000000000000..ea8ff02a9d5d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.18
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+RESTRICT=!test? ( test )
+SLOT=7.3
+SRC_URI=https://www.php.net/distributions/php-7.3.18.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c4e563ee3d99d0c777b8d426421a310c
diff --git a/metadata/md5-cache/dev-lang/php-7.4.6 b/metadata/md5-cache/dev-lang/php-7.4.6
new file mode 100644
index 000000000000..289ac4f63546
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=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 prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=7.4
+SRC_URI=https://www.php.net/distributions/php-7.4.6.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c82a44f81c56723eed21129f47bbf7b2
diff --git a/metadata/md5-cache/dev-lang/python-3.8.3 b/metadata/md5-cache/dev-lang/python-3.8.3
new file mode 100644
index 000000000000..656f0990e7f7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.3
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.3.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5989187fc6e2a16eb2944f65455fc412
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.27 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.30
similarity index 96%
rename from metadata/md5-cache/dev-lang/swi-prolog-8.1.27
rename to metadata/md5-cache/dev-lang/swi-prolog-8.1.30
index 91f6e91da778..07614a8a0b6a 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.27
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.30
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.27.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.30.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=558cb1731977f1895e4a8a131f27c830
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.28 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.31
similarity index 96%
rename from metadata/md5-cache/dev-lang/swi-prolog-8.1.28
rename to metadata/md5-cache/dev-lang/swi-prolog-8.1.31
index ca3d1511cb3e..6525920f03ac 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.28
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.31
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.28.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.31.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=558cb1731977f1895e4a8a131f27c830
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index e986d7b48839..f8e865c1827b 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0249594d385ddcb6cbb1acd6950516b5
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=42f535bfa8ea4a4e5b824453768e7c96
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d123ace33d2f..b31c861f06a8 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/botan-2.14.0-r1 b/metadata/md5-cache/dev-libs/botan-2.14.0-r1
new file mode 100644
index 000000000000..0c09015a97f4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/botan-2.14.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/python:* doc? ( dev-python/sphinx )
+DEFINED_PHASES=configure install test
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=C++ crypto library
+EAPI=7
+HOMEPAGE=https://botan.randombit.net/
+IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=BSD
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) sqlite? ( dev-db/sqlite:3= ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=2/2.14
+SRC_URI=https://botan.randombit.net/releases/Botan-2.14.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e3ba5af2bd3aa266874596529e8a4d7e
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
index d35d378e83af..605c5927d09d 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP13/pcsc-cyberjack_3.99.5final.SP13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=08a2864d42150d50c59d3b527390be46
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=1917ff3c708a102f0da86298b10eb7e7
diff --git a/metadata/md5-cache/dev-libs/json-c-0.14-r1 b/metadata/md5-cache/dev-libs/json-c-0.14-r1
index d4eec2b48e23..fb9b721c7b68 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.14-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.14-r1
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.14.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77f6881ef868747ec28eb1b0b834e6a1
+_md5_=2ddf502cdb6526f56153d95a4a8a0f41
diff --git a/metadata/md5-cache/dev-libs/json-c-0.14-r2 b/metadata/md5-cache/dev-libs/json-c-0.14-r2
new file mode 100644
index 000000000000..0cb4cb9a26bf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/json-c-0.14-r2
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A JSON implementation in C
+EAPI=7
+HOMEPAGE=https://github.com/json-c/json-c/wiki
+IUSE=doc 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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0/5
+SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.14.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a50443a0dd0e6ccc004b5c922b7ff732
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
index e1b91c4da2e8..11ebd445b8f5 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for building efficient parsers, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f012fc02823b3f8438f802c4e8d81c61
+_md5_=40855bd10e5b2379dc1a83268631c69e
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7 b/metadata/md5-cache/dev-libs/librep-0.92.7
new file mode 100644
index 000000000000..3d9ac54e5f0d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7
@@ -0,0 +1,13 @@
+BDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= ) sys-apps/texinfo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DESCRIPTION=Shared library implementing a Lisp dialect
+EAPI=7
+HOMEPAGE=https://sawfish.fandom.com/
+IUSE=emacs gmp readline
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1d8b0c6df40439769e3b7ca4ef40ef49
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1 b/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
index 29f556fede00..b785df2754ac 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
@@ -11,4 +11,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.7.0.tar.gz -> libtpms-0.7.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43c5c27fcbcfd711500640b6c9793355
+_md5_=d8c6a6ed35938d05d6b13b26ed870f78
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5-r1 b/metadata/md5-cache/dev-libs/maloc-1.5-r1
index 3b37dd46950f..6006be7bb886 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5-r1
+++ b/metadata/md5-cache/dev-libs/maloc-1.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/readline:0= mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=5
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
 IUSE=doc mpi static-libs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
+RDEPEND=sys-libs/readline:0= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7dd429f93cef51b93bcd9cfacf2660d
+_md5_=a1f9cce1d36f7986e99db271bd0f4dda
diff --git a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3 b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
index 0057bd819509..6ae04ef870d2 100644
--- a/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
+++ b/metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Alternative to vendor specific OpenCL ICD loaders
 EAPI=7
 HOMEPAGE=https://github.com/OCL-dev/ocl-icd
 IUSE=+khronos-headers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/opencl-icd-loader
 SLOT=0
 SRC_URI=https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz -> ocl-icd-2.2.12.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=63b348d58af6ff71c8f347e043438116
+_md5_=ef4474a161eed409ffa09c5cdd50dfdf
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
index 64c3904d342a..e19c62ba46c8 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Official Khronos OpenCL ICD Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.03.13.tar.gz -> opencl-icd-loader-2020.03.13.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a154a6b806efe05b8fa7ce79d4b37bc3
+_md5_=913ee998c63a2fa22dee58672f02a2dc
diff --git a/metadata/md5-cache/dev-libs/pcl-1.12-r1 b/metadata/md5-cache/dev-libs/pcl-1.12-r1
index f55697f7dba0..597dfd85c8ae 100644
--- a/metadata/md5-cache/dev-libs/pcl-1.12-r1
+++ b/metadata/md5-cache/dev-libs/pcl-1.12-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Portable Coroutine Library
 EAPI=7
 HOMEPAGE=http://xmailserver.org/libpcl.html
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
 SLOT=0/1
 SRC_URI=http://xmailserver.org/pcl-1.12.tar.gz
-_md5_=c815857f560bf9795486cef16ff295ab
+_md5_=96e78753e012171d913a0ce9d52294a3
diff --git a/metadata/md5-cache/dev-libs/pigpio-72 b/metadata/md5-cache/dev-libs/pigpio-72
deleted file mode 100644
index 55aae5df54b1..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-72
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/index.html
-IUSE=python python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/V72.tar.gz -> pigpio-72.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=32fdacfae0f7729dc6c46b436754edc9
diff --git a/metadata/md5-cache/dev-libs/pigpio-73 b/metadata/md5-cache/dev-libs/pigpio-73
deleted file mode 100644
index 2799ed16dece..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-73
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/index.html
-IUSE=python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/V73.tar.gz -> pigpio-73.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=faec3518f50b5ef05cb5182ed788785c
diff --git a/metadata/md5-cache/dev-libs/pigpio-74 b/metadata/md5-cache/dev-libs/pigpio-74
deleted file mode 100644
index 88a5ead30114..000000000000
--- a/metadata/md5-cache/dev-libs/pigpio-74
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
-EAPI=7
-HOMEPAGE=http://abyz.me.uk/rpi/pigpio/index.html https://github.com/joan2937/pigpio
-IUSE=python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~arm
-LICENSE=Unlicense
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/joan2937/pigpio/archive/v74.tar.gz -> pigpio-74.tar.gz
-_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=417370e3ba0f087a58aa9ebb289e233d
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.0
new file mode 100644
index 000000000000..3867b4961460
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.69.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Plasma Specific Protocols for Wayland
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/plasma-wayland-protocols.git
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.0/plasma-wayland-protocols-1.0.tar.xz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f49fd631042f4ba7bfa863d81ff5420e
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.12 b/metadata/md5-cache/dev-libs/zlog-1.2.12
deleted file mode 100644
index 4dc69e4ee681..000000000000
--- a/metadata/md5-cache/dev-libs/zlog-1.2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library.
-EAPI=6
-HOMEPAGE=http://hardysimpson.github.io/zlog/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz -> zlog-v1.2.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26470e4fd77c3c6063e093d0bf6c95f8
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.12-r1 b/metadata/md5-cache/dev-libs/zlog-1.2.14
similarity index 72%
rename from metadata/md5-cache/dev-libs/zlog-1.2.12-r1
rename to metadata/md5-cache/dev-libs/zlog-1.2.14
index c09eaa3cf3b9..8a241528ae0c 100644
--- a/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.14
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz -> zlog-v1.2.12.tar.gz
+SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.14.tar.gz -> zlog-v1.2.14.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66f3007afdc98348aea800e9ed6f5708
+_md5_=b4bb9e521e8bd13b0015426e84c80904
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 48c49e5773d7..92b78a0d5e60 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11 b/metadata/md5-cache/dev-ml/camlp5-7.11
index 26380e3c4ea5..826658649565 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.11
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml
 SLOT=0/7.11
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel711.tar.gz -> camlp5-7.11.tar.gz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=d6d6c4a141f7c8c38c705f57fdcaa67d
+_md5_=1179d2e1dae2509c49a5c26725d47993
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.10 b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
index 19159231b3c6..f08c40bee5af 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.10
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.10
@@ -10,4 +10,4 @@ LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
 SLOT=2/2.18.10
 SRC_URI=https://github.com/garrigue/lablgtk/archive/2.18.10.tar.gz -> lablgtk-2.18.10.tar.gz
-_md5_=c65d63fe7593b09f73c49511c24f3f4a
+_md5_=5eb498d5132eafd152a1683c0d519746
diff --git a/metadata/md5-cache/dev-perl/Cairo-GObject-1.5.0 b/metadata/md5-cache/dev-perl/Cairo-GObject-1.5.0
new file mode 100644
index 000000000000..0bbffeef6ef8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cairo-GObject-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=x11-libs/cairo[glib] >=dev-perl/glib-perl-1.224.0 >=dev-perl/Cairo-1.80.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.200.0 >=dev-perl/ExtUtils-PkgConfig-1.0.0 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Integrate Cairo into the Glib type system
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Cairo-GObject
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=x11-libs/cairo[glib] >=dev-perl/glib-perl-1.224.0 >=dev-perl/Cairo-1.80.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=60ccefe3c27e6e3e481232dd3dd902ab
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
index 5f619d5291c9..2cb993c83c55 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
@@ -4,11 +4,11 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IPC-Run
 IUSE=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
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7d1dfde11d28794eb89b8274e0b113cd
+_md5_=abf03305cb145d3c94c3bdba20a0f25a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index a0695ff26263..4f30949e5ed8 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/Time-Duration-1.200.0 b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
index bd2cd848fef1..c054f1742c5b 100644
--- a/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
+++ b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rounded or exact English expression of durations
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Time-Duration
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=330c58274814db79d97dfcdf0ab07009
+_md5_=fcf0ff1b6445f41297c330a21c490792
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 110a0a98c311..efa77009ac2e 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3 b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
index cd327d2a1946..59e8e7530afa 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Generating CHAP packets
 EAPI=7
 HOMEPAGE=https://pear.php.net/package/Crypt_CHAP
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=|| ( ( dev-php/pecl-mcrypt >=dev-lang/php-7.2:*[hash(+)] ) <dev-lang/php-7.2:*[crypt,hash] ) >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=097de6e8420366a7a276378748b14a52
+_md5_=50975d9d5f3a34fe8914b849e824429a
diff --git a/metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1 b/metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
index 714131a82939..bfb8b63121c0 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Class for managing SAMBA style password files
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/File_SMBPasswd
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-Crypt_CHAP-1.0.0 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/File_SMBPasswd-1.0.3.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=1362f8be9bfa6c45613afef7e8f802fe
+_md5_=b0656c7742206ef7728980a83d920e4e
diff --git a/metadata/md5-cache/dev-php/pecl-amqp-1.9.4 b/metadata/md5-cache/dev-php/pecl-amqp-1.9.4
deleted file mode 100644
index 0575f6bcfb29..000000000000
--- a/metadata/md5-cache/dev-php/pecl-amqp-1.9.4
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
-EAPI=7
-HOMEPAGE=https://pecl.php.net/amqp
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/amqp-1.9.4.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b9da2aba82594705c0723e7ad1ea5fca
diff --git a/metadata/md5-cache/dev-php/pecl-amqp-1.9.4-r1 b/metadata/md5-cache/dev-php/pecl-amqp-1.9.4-r1
deleted file mode 100644
index e2656b6d501a..000000000000
--- a/metadata/md5-cache/dev-php/pecl-amqp-1.9.4-r1
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
-EAPI=7
-HOMEPAGE=https://pecl.php.net/amqp
-IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/amqp-1.9.4.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=070363ff57bf703f8123f531d908a352
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
deleted file mode 100644
index 50057bcdd004..000000000000
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.12.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cebd90be2af3271b5bba77f941ba4647
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.17-r1 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.17-r1
deleted file mode 100644
index d5ad4dd819a5..000000000000
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=7
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.17.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1aa7caf53781c159de3bfcaee72bc9ce
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1 b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
deleted file mode 100644
index 480a2ae14355..000000000000
--- a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) dev-util/re2c >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/mailparse-3.0.2.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee3b03c59f48a01b055f6198f4e4a78f
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.3-r1 b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.3-r1
deleted file mode 100644
index 6bc22ee1e588..000000000000
--- a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
-DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
-EAPI=7
-HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/mailparse-3.0.3.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4b15542b7a19415fc15fddac5c0372c
diff --git a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3 b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
index c0c971aef9e0..694c5f2fbe2d 100644
--- a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=Bindings for the libmcrypt library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/mcrypt
 IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=dev-libs/libmcrypt php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
 REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mcrypt-1.0.3.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	1aa741f0d0128470481dff5011ba00c4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=79f015d67b22a658b1d52f00b74483b7
+_md5_=3ed86c9009b1d5de92f95e9ef6f5f115
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.5.3 b/metadata/md5-cache/dev-python/APScheduler-3.5.3
deleted file mode 100644
index 5db596515909..000000000000
--- a/metadata/md5-cache/dev-python/APScheduler-3.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=In-process task scheduler with Cron-like capabilities
-EAPI=6
-HOMEPAGE=https://github.com/agronholm/apscheduler
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.5.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0648dc1332505d4da0d6d354636458db
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.6.3 b/metadata/md5-cache/dev-python/APScheduler-3.6.3
new file mode 100644
index 000000000000..86b0781dbca1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/APScheduler-3.6.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tzlocal-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=In-process task scheduler with Cron-like capabilities
+EAPI=7
+HOMEPAGE=https://github.com/agronholm/apscheduler
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tzlocal-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.6.3.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7409b01af47275808a6a7d5361d3d649
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1d56f34a4600..dfa5478a092b 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/authres-1.2.0 b/metadata/md5-cache/dev-python/authres-1.2.0
index 252ba6ea6fe1..1e510a5b97a5 100644
--- a/metadata/md5-cache/dev-python/authres-1.2.0
+++ b/metadata/md5-cache/dev-python/authres-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Parse and generate Authentication-Results headers
 EAPI=7
 HOMEPAGE=https://launchpad.net/authentication-results-python https://pypi.org/project/authres/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ca074c66e817010f09f7f15f91293419
+_md5_=2caec887662fb00d0d10341b7707dee7
diff --git a/metadata/md5-cache/dev-python/bareos-19.2.7 b/metadata/md5-cache/dev-python/bareos-19.2.7
new file mode 100644
index 000000000000..9a4e813e7d4d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bareos-19.2.7
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=python bindings for bareos network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.7.tar.gz -> bareos-19.2.7.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dcbcff09df45e6748c838ad4ad72a033
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.3 b/metadata/md5-cache/dev-python/binaryornot-0.4.3
deleted file mode 100644
index 2eab3f837144..000000000000
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/chardet-3.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Ultra-lightweight pure Python package to guess whether a file is binary or text
-EAPI=6
-HOMEPAGE=https://github.com/audreyr/binaryornot
-IUSE=test python_targets_python3_6
-KEYWORDS=amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/audreyr/binaryornot/archive/0.4.3.tar.gz -> binaryornot-0.4.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36fac9037c3753dc49a00e5390e4713b
diff --git a/metadata/md5-cache/dev-python/bpython-0.18 b/metadata/md5-cache/dev-python/bpython-0.18
deleted file mode 100644
index 8b9f3dd29402..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/curtsies-0.2.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/watchdog[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=6
-HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
-IUSE=doc test python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jedi[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/watchdog[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/b/bpython/bpython-0.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f765f90431244c753d350e39841e8e94
diff --git a/metadata/md5-cache/dev-python/commonmark-0.5.4 b/metadata/md5-cache/dev-python/commonmark-0.5.4
deleted file mode 100644
index 5e5521a26e9e..000000000000
--- a/metadata/md5-cache/dev-python/commonmark-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.5.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25f500f6e7e7fd32ac163fbf18f74751
diff --git a/metadata/md5-cache/dev-python/commonmark-0.8.1 b/metadata/md5-cache/dev-python/commonmark-0.8.1
deleted file mode 100644
index fef8cdb6f698..000000000000
--- a/metadata/md5-cache/dev-python/commonmark-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/hypothesis-3.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python parser for the CommonMark Markdown spec
-EAPI=6
-HOMEPAGE=https://github.com/rtfd/CommonMark-py
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/commonmark/commonmark-0.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba528e87786b38a18ba8c9703b4fdfeb
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1 b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
new file mode 100644
index 000000000000..44c4418ad6ac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= )
+DESCRIPTION=Python package for convex optimization
+EAPI=7
+HOMEPAGE=http://cvxopt.org/ https://github.com/cvxopt/cvxopt
+IUSE=doc +dsdp examples fftw +glpk gsl test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.5.tar.gz -> cvxopt-1.2.5.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ab80f3ffb363ead2022582d5c39f106f
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.10 b/metadata/md5-cache/dev-python/deprecated-1.2.10
new file mode 100644
index 000000000000..457672c514b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python @deprecated decorator to deprecate old API
+EAPI=7
+HOMEPAGE=https://github.com/tantale/deprecated
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.10.tar.gz -> deprecated-1.2.10.gh.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f9ebb9a413e804e27a94cf2656b16d7c
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.9 b/metadata/md5-cache/dev-python/deprecated-1.2.9
index f833e7d5c3ea..402cb3d3fd65 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.9
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.9
@@ -4,7 +4,7 @@ DESCRIPTION=Python @deprecated decorator to deprecate old API
 EAPI=7
 HOMEPAGE=https://github.com/tantale/deprecated
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.9.tar.gz -> deprecated-1.2.9.gh.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f9ebb9a413e804e27a94cf2656b16d7c
+_md5_=0289aae5876fd03d186194abd61d03ca
diff --git a/metadata/md5-cache/dev-python/django-2.2.12 b/metadata/md5-cache/dev-python/django-2.2.12
index 139e162115cf..169e1c302792 100644
--- a/metadata/md5-cache/dev-python/django-2.2.12
+++ b/metadata/md5-cache/dev-python/django-2.2.12
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=High-level Python web framework
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.12.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ad9d91461549c13c221a2051f3ea24c2
+_md5_=fc6678a98463e4cbedefea72774dfd5c
diff --git a/metadata/md5-cache/dev-python/django-3.0.6 b/metadata/md5-cache/dev-python/django-3.0.6
index f9b8cf4bc5e0..fc69ac36ea86 100644
--- a/metadata/md5-cache/dev-python/django-3.0.6
+++ b/metadata/md5-cache/dev-python/django-3.0.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?,threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=High-level Python web framework
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/3.0/Django-3.0.6.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=df9ac92c3d09d2ca72734ad584cfa1ca
+_md5_=d823538877032482473bbc133b6e3e90
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.17.0 b/metadata/md5-cache/dev-python/google-api-core-1.17.0
index 7759042d4dd7..6b352618db0a 100644
--- a/metadata/md5-cache/dev-python/google-api-core-1.17.0
+++ b/metadata/md5-cache/dev-python/google-api-core-1.17.0
@@ -4,7 +4,7 @@ DESCRIPTION=Core Library for Google Client Libraries
 EAPI=7
 HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/googleapis-common-protos[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/requests-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.17.0.tar.gz -> google-api-core-1.17.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f1aa613922c047d9089ece11b69a88ee
+_md5_=122408d211d26e17906f5a966a9ceded
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.8.3 b/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
similarity index 94%
rename from metadata/md5-cache/dev-python/google-api-python-client-1.8.3
rename to metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
index a20383883e2a..3b94964d7aaf 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.8.3
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
@@ -1,11 +1,11 @@
 BDEPEND=test? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/httplib2-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/google-api-core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/uritemplate-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/uritemplate-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/six-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/httplib2-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/google-api-core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/uritemplate-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/uritemplate-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/six-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/google-auth-httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/httplib2-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/google-api-core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/uritemplate-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/uritemplate-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/six-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/google-auth-httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/oauth2client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Google API Client for Python
 EAPI=7
 HOMEPAGE=https://github.com/google/google-api-python-client
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/httplib2-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/google-api-core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/uritemplate-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/uritemplate-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/six-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.8.3.tar.gz -> google-api-python-client-1.8.3.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59dca80101be5ab6b0ccce4fb35c3f1d
+_md5_=5e54f2440ba6b380574c414a9a1ddffc
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.31 b/metadata/md5-cache/dev-python/google-apitools-0.5.31
new file mode 100644
index 000000000000..7566938c94f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.31
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/httplib2-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/fasteners-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oauth2client-1.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-gflags-3.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/fasteners-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oauth2client-1.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-gflags-3.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-18.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python library to manipulate Google APIs
+EAPI=7
+HOMEPAGE=https://github.com/google/apitools
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/fasteners-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oauth2client-1.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-gflags-3.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/apitools/archive/v0.5.31.tar.gz -> google-apitools-0.5.31.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=feb35975e146fee6fb75f89ec07480d6
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
index a12802296a02..478c52c7b7db 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
@@ -4,11 +4,11 @@ DESCRIPTION=python classes generated from the common protos in the googleapis re
 EAPI=7
 HOMEPAGE=https://pypi.org/project/googleapis-common-protos/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-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 )
 SLOT=0
 SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.51.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f153eeb35018e42d2e8f5b142e21d457
+_md5_=433bcb1e93afa9630b42e434d4d1ef37
diff --git a/metadata/md5-cache/dev-python/h5py-2.10.0-r1 b/metadata/md5-cache/dev-python/h5py-2.10.0-r1
index 2f0f7a21b87f..1d8fb6c85c60 100644
--- a/metadata/md5-cache/dev-python/h5py-2.10.0-r1
+++ b/metadata/md5-cache/dev-python/h5py-2.10.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Simple Python interface to HDF5 files
 EAPI=7
 HOMEPAGE=https://www.h5py.org
 IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[hl(+)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.10.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee8a4d5733683d1623b52d912fd96905
+_md5_=fdcb4f002f0eec3d86cb50c8705cd36b
diff --git a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1 b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
index c391f485e462..3780ff604b51 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.0.2.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cea6c050b11d07ab7dca7d39c927503d
+_md5_=9922cb4132ca4cab471b4ec2d7e14832
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0 b/metadata/md5-cache/dev-python/ipaddr-2.2.0
index a0e00ee76a38..a35e4ded7c6a 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python IP address manipulation library
 EAPI=7
 HOMEPAGE=https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f318520f7e63523e46a1ba50f9bd3e9f
+_md5_=ac58d54c5e56c1a0c1d5ec6076852fa0
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0 b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
index 1d7f89bc4191..9f444a047f23 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for working with iterables. Complements itertools and more_ite
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.itertools
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-5.0.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=592ad462de8df313dab8234e7c0c78da
+_md5_=9ea00bcdc8c4df6af57ef0a4011235fa
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1 b/metadata/md5-cache/dev-python/pockets-0.9.1
index 3a3ec0120300..446524da77ad 100644
--- a/metadata/md5-cache/dev-python/pockets-0.9.1
+++ b/metadata/md5-cache/dev-python/pockets-0.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=Collection of helpful Python tools
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pockets/
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pockets/pockets-0.9.1.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=320e4314ce3c7c3b94e8fdd978e2b403
+_md5_=67dba3d16f6b9e32f7b1b01fd991602a
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.6 b/metadata/md5-cache/dev-python/pygresql-5.0.6
index 3d5205dc0023..6f502ab6c6dd 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.6
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	0f69f5b2817c4dbd525e67890fdc86e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4de5bf68690651172796f1036a2ec7fd
diff --git a/metadata/md5-cache/dev-python/pygresql-5.1 b/metadata/md5-cache/dev-python/pygresql-5.1
index bcd4bcc7c0d1..89875c859f93 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.1
+++ b/metadata/md5-cache/dev-python/pygresql-5.1
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	0f69f5b2817c4dbd525e67890fdc86e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=873ebd4fe747ed8db0659b1efcb83265
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.4 b/metadata/md5-cache/dev-python/pypugjs-5.9.4-r1
similarity index 97%
rename from metadata/md5-cache/dev-python/pypugjs-5.9.4
rename to metadata/md5-cache/dev-python/pypugjs-5.9.4-r1
index 4eae3e82f692..8cc87eefd775 100644
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.4
+++ b/metadata/md5-cache/dev-python/pypugjs-5.9.4-r1
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/chardet python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.4.tar.gz -> pypugjs-5.9.4-tar.gz
+SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.4.tar.gz -> pypugjs-5.9.4.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8e3884589fcc322192f769746b5a3976
+_md5_=bf40c4c404633e26aafe58b61ad2edd1
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.14 b/metadata/md5-cache/dev-python/pyspf-2.0.14
index 1a59a543cf5f..17846408ff24 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.14
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.14
@@ -5,7 +5,7 @@ DESCRIPTION=Python implementation of the Sender Policy Framework (SPF)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyspf/
 IUSE=ipv6 test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=dev-python/authres[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( dev-python/pydns:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/dnspython[python_targets_python3_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[ipv6?] ) python_targets_python3_7? ( dev-lang/python:3.7[ipv6?] ) python_targets_python3_8? ( dev-lang/python:3.8[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.14.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f998a8e8c50d2d223d20b740bd4e143
+_md5_=504da00565693e1c528bc46816605bb1
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
index c51fe109cb46..885e9747e160 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
 HOMEPAGE=http://www.orocos.org/kdl
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ab1b32038262ae1a8c2898850525ab0
+_md5_=44e9bd7e9bdfb0cf63d1a7f361323356
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index d869cfe490b7..542c9d8458b4 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
 HOMEPAGE=http://www.orocos.org/kdl
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ab1b32038262ae1a8c2898850525ab0
+_md5_=44e9bd7e9bdfb0cf63d1a7f361323356
diff --git a/metadata/md5-cache/dev-python/setuptools-46.3.0 b/metadata/md5-cache/dev-python/setuptools-46.3.0
new file mode 100644
index 000000000000..2e539e277fd2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-46.3.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-3.7.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-46.3.0.zip
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bb82e9a853887a5b9c8a66a1913a3e6b
diff --git a/metadata/md5-cache/dev-python/six-1.14.0 b/metadata/md5-cache/dev-python/six-1.14.0
index 985e11187df8..f752904d569d 100644
--- a/metadata/md5-cache/dev-python/six-1.14.0
+++ b/metadata/md5-cache/dev-python/six-1.14.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.14.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bf7061125ac1bcdd1b2ecf1645cbc7a1
+_md5_=e9241f6184b030ec1e3ef5e0b86e82ea
diff --git a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0 b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
index e51b2980bca9..10ab12691b4a 100644
--- a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Sphinx extension for linking to your project's issue tracker
 EAPI=7
 HOMEPAGE=https://github.com/sloria/sphinx-issues
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sloria/sphinx-issues/archive/1.2.0.tar.gz -> sphinx-issues-1.2.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ae914d9a9a29c0900de0bac233b1bd1
+_md5_=0f9086d85ea8b0352fb7eaa4e48640cf
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
index 21a399722e0a..a929db049abc 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=sphinx extension to support coroutines in markup
 EAPI=6
 HOMEPAGE=https://github.com/aio-libs/sphinxcontrib-asyncio
 IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcfd931a8d88a7e51f2880654b771174
+_md5_=c13ce2d34e26c54fd142d61845ae32c0
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.3.1 b/metadata/md5-cache/dev-python/sqlparse-0.3.1
index 04c398f2d3c9..61014dafebad 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.3.1
+++ b/metadata/md5-cache/dev-python/sqlparse-0.3.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.3.1.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6fb38aa64597a59581e5fc1d1a5c4c28
+_md5_=80a9199769080072285f048c54ef083f
diff --git a/metadata/md5-cache/dev-python/zipp-3.1.0 b/metadata/md5-cache/dev-python/zipp-3.1.0
index fae95d78464c..ad0f85018e9c 100644
--- a/metadata/md5-cache/dev-python/zipp-3.1.0
+++ b/metadata/md5-cache/dev-python/zipp-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/zipp
 IUSE=test doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-3.1.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f647c57ec7d5ef5f49ccfc8788ae29dd
+_md5_=6019d5c0cdc6d265b3c2d61947056198
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index b59d3d3b6c66..c63d383de14f 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/qtlocation-5.14.2 b/metadata/md5-cache/dev-qt/qtlocation-5.14.2
index a046f58b562b..055d07a71c17 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.14.2
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.14.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	qt5-build	851b1ee08ff6a2cc14b2547abd09c9d6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f015644a49bc8c0c1779ec04f4736454
+_md5_=f87f9a9ad5c299f5275176c26fc8c3d1
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.14.2 b/metadata/md5-cache/dev-qt/qtwebengine-5.14.2
index d7ca3e7bee10..9b1d7498070a 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.14.2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.14.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	qt5-build	851b1ee08ff6a2cc14b2547abd09c9d6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=1f2093e7491449a0643944742539dde1
+_md5_=d577cad2762e0ed012d12b4597702672
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6c80dbd1753f..11bf0e80cda8 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/rmagick-3.2.0 b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
index 75312eb2528f..79af0b31830b 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing l
 EAPI=6
 HOMEPAGE=https://github.com/gemhome/rmagick
 IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~hppa ppc ppc64 ~x86 ~x86-macos
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-macos
 LICENSE=Artistic
 RDEPEND=>=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6* ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rmagick-3.2.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=253888d40f98718aecee751562bb02b0
+_md5_=9acabe1eaca49b10cad3217afb60e758
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2e2fe3938a65..5860a22f194c 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/buildbot-2.7.0 b/metadata/md5-cache/dev-util/buildbot-2.7.0
index e208abc5ce68..b0b7ab27fe0b 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.7.0
+++ b/metadata/md5-cache/dev-util/buildbot-2.7.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.7.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fbeb20aa8eea46a86c6d4b1f730050b1
+_md5_=ec97e122c991b0e038ae200b66890442
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index a8c0aa4d018e..7d2d593a546b 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cd7ea760f98d42cf8910ba7646aaef38
+_md5_=29d5cb8a34cf0652a4902a733fc59f71
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
index f526988bf1ba..82003c7d6910 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=~dev-util/buildbot-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-www-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=BuildBot grid view web interface
 EAPI=7
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.7.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=404f82be34d791d2da8afee0f9dab90a
+_md5_=e6b215cec551502ff7fe4feef2c47277
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.7.0 b/metadata/md5-cache/dev-util/buildbot-worker-2.7.0
index 429bb8726124..448759c794be 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.7.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.7.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.7.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2be753e030bd6b1566518d23d80be395
+_md5_=40b747481e96c9ae8cdd493d5337a8ed
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 9f6841c294e2..7635feb2f387 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2be753e030bd6b1566518d23d80be395
+_md5_=40b747481e96c9ae8cdd493d5337a8ed
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
index 2cb22557c7ff..a28418d5fd3b 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-util/buildbot-www-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-util/buildbot-www-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
 EAPI=7
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c73d4e1d4b2c691a73f5681a0a0fece
+_md5_=0636226d9b3891a35a90af9556c54e1f
diff --git a/metadata/md5-cache/dev-util/kernelshark-1.0 b/metadata/md5-cache/dev-util/kernelshark-1.0
index a9db1b126b04..0076aaea4339 100644
--- a/metadata/md5-cache/dev-util/kernelshark-1.0
+++ b/metadata/md5-cache/dev-util/kernelshark-1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-util/trace-cmd-2.8.3:= dev-libs/json-c:= >=media-libs/freeglut-3.0.0:= x11-libs/libXmu:= x11-libs/libXi:= dev-qt/qtcore:5= dev-qt/qtwidgets:5= dev-qt/qtnetwork:5=
 DESCRIPTION=Graphical reader for trace-cmd output
 EAPI=7
-HOMEPAGE=http://kernelshark.org/
+HOMEPAGE=https://kernelshark.org/
 IUSE=custom-optimization doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-util/trace-cmd-2.8.3:= dev-libs/json-c:= >=media-libs/freeglut-3.0
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-kernelshark-v1.0.tar.gz -> kernelshark-1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=628d0fb2441235d5e13c782f81fa3f29
+_md5_=755f4147d4959f4c67537b91b7655bf1
diff --git a/metadata/md5-cache/dev-util/kernelshark-9999 b/metadata/md5-cache/dev-util/kernelshark-9999
index 50bf463f04e3..6f61962321e3 100644
--- a/metadata/md5-cache/dev-util/kernelshark-9999
+++ b/metadata/md5-cache/dev-util/kernelshark-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-util/trace-cmd-2.8.3:= dev-libs/json-c:= >=media-libs/freeglut-3.0.0:= x11-libs/libXmu:= x11-libs/libXi:= dev-qt/qtcore:5= dev-qt/qtwidgets:5= dev-qt/qtnetwork:5=
 DESCRIPTION=Graphical reader for trace-cmd output
 EAPI=7
-HOMEPAGE=http://kernelshark.org/
+HOMEPAGE=https://kernelshark.org/
 IUSE=custom-optimization doc
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=>=dev-util/trace-cmd-2.8.3:= dev-libs/json-c:= >=media-libs/freeglut-3.0.0:= x11-libs/libXmu:= x11-libs/libXi:= dev-qt/qtcore:5= dev-qt/qtwidgets:5= dev-qt/qtnetwork:5=
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=628d0fb2441235d5e13c782f81fa3f29
+_md5_=755f4147d4959f4c67537b91b7655bf1
diff --git a/metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1 b/metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
index 487110dd04bc..aaed8042a506 100644
--- a/metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
+++ b/metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
@@ -3,9 +3,9 @@ DEPEND=!app-eselect/eselect-opencl
 DESCRIPTION=Unified C language headers for the OpenCL API
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-Headers
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-Headers/archive/v2020.03.13.tar.gz -> opencl-headers-2020.03.13.tar.gz
-_md5_=433d2e09def763c6c2df6f4814a9a864
+_md5_=cd9c3b148bf686864e499f3ce0bf731c
diff --git a/metadata/md5-cache/dev-util/rt-tests-1.8 b/metadata/md5-cache/dev-util/rt-tests-1.8
index 2ef46b0ed921..509430ee3e66 100644
--- a/metadata/md5-cache/dev-util/rt-tests-1.8
+++ b/metadata/md5-cache/dev-util/rt-tests-1.8
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-process/numactl
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.8.tar.xz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38a86c1622fa56aeacadb3cf7c6a58e7
+_md5_=bdd5035813311f5aeaf7557a191ff66b
diff --git a/metadata/md5-cache/dev-util/trace-cmd-9999 b/metadata/md5-cache/dev-util/trace-cmd-9999
index a9a54da69a15..9167a359e5e2 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-9999
+++ b/metadata/md5-cache/dev-util/trace-cmd-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install setup unpack
 DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udis86? ( dev-libs/udis86 ) sys-kernel/linux-headers python? ( virtual/pkgconfig dev-lang/swig ) doc? ( app-text/asciidoc )
 DESCRIPTION=User-space front-end for Ftrace
 EAPI=7
-HOMEPAGE=http://trace-cmd.org/
+HOMEPAGE=https://trace-cmd.org/
 IUSE=+audit doc python udis86 kernel_linux python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2+ LGPL-2.1+
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_6? ( dev-l
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0/9999
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	linux-info	ed97304af323c7b2f6934f229982cb7d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bd07f9a4d0a6235fece523e6e9f4fb05
+_md5_=24bfbca9aef0214b67c6c31216a7912e
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.68.1 b/metadata/md5-cache/dev-util/uncrustify-0.71.0
similarity index 85%
rename from metadata/md5-cache/dev-util/uncrustify-0.68.1
rename to metadata/md5-cache/dev-util/uncrustify-0.71.0
index a2dfc657314d..0fd90245e254 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.68.1
+++ b/metadata/md5-cache/dev-util/uncrustify-0.71.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=6
 HOMEPAGE=http://uncrustify.sourceforge.net/
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solari
 LICENSE=GPL-2
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz
+SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.71.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24347f490869e11d3f7c6f95a409481d
+_md5_=30f9d73b6f85378f08cb01f1ba10ba6e
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index 1d9691183f28..5aa86699175f 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=C/C++/C#/D/Java/Pawn code indenter and beautifier
 EAPI=6
 HOMEPAGE=http://uncrustify.sourceforge.net/
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24347f490869e11d3f7c6f95a409481d
+_md5_=30f9d73b6f85378f08cb01f1ba10ba6e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index eaf75b3d2016..15948be11fe6 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.13.0-r1 b/metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
index 6400d183f5dd..b310fcb6d780 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35b597a7f08a7e6f3ea88bff147dbc79
+_md5_=f288f6885e9447ddd1af25b6ae44ad76
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 91c16d078786..371ae0a3bfee 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/supertux-0.6.2_rc1 b/metadata/md5-cache/games-arcade/supertux-0.6.2
similarity index 93%
rename from metadata/md5-cache/games-arcade/supertux-0.6.2_rc1
rename to metadata/md5-cache/games-arcade/supertux-0.6.2
index e44f40a003a7..e48868072086 100644
--- a/metadata/md5-cache/games-arcade/supertux-0.6.2_rc1
+++ b/metadata/md5-cache/games-arcade/supertux-0.6.2
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
 RDEPEND=>=dev-games/physfs-3.0 dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7
 SLOT=0
-SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.2-rc.1/SuperTux-v0.6.2-rc.1-Source.tar.gz
+SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.2/SuperTux-v0.6.2-Source.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=834031dc59a5432df3d4b585f6474f15
+_md5_=b016654deb8052ddacdb3182b9fa71b1
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 84cdd44563bf..d0a119f47575 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.12 b/metadata/md5-cache/games-strategy/colobot-0.1.12
index 891b59286800..a19a0c948de0 100644
--- a/metadata/md5-cache/games-strategy/colobot-0.1.12
+++ b/metadata/md5-cache/games-strategy/colobot-0.1.12
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.12-alpha.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ab33d4826363e3efac7547630c47b17
+_md5_=b766988ccc7b20151b596cf0b2b9db3a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index d41b47f0e5ff..1a3aa8f681ab 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-33-r2 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-33-r2
new file mode 100644
index 000000000000..3116805365fb
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-33-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2
+DESCRIPTION=KDE Connect implementation for Gnome Shell
+EAPI=7
+HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
+IUSE=nautilus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 =gnome-base/gnome-shell-3.34* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
+SLOT=0
+SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v33.tar.gz -> gnome-shell-extension-gsconnect-33.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	991e544bbaf3120073ededbdc1d8bf93	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=987adfe6a05a1c5764a88179f12c2072
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 92666294e94f..cebc86e9de25 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/messagelib-20.04.0 b/metadata/md5-cache/kde-apps/messagelib-20.04.0-r1
similarity index 99%
rename from metadata/md5-cache/kde-apps/messagelib-20.04.0
rename to metadata/md5-cache/kde-apps/messagelib-20.04.0-r1
index 2099e8a92e40..125fcdcf1138 100644
--- a/metadata/md5-cache/kde-apps/messagelib-20.04.0
+++ b/metadata/md5-cache/kde-apps/messagelib-20.04.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.0/src/messagelib-20.04.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c58dc8a4006795c5a3b83f9aecf4860
+_md5_=dc6ce93c84aac21afff63a29700ab91a
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 9f54e8b12393..b5a4d5d416f3 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.70.0 b/metadata/md5-cache/kde-frameworks/kio-5.70.0-r1
similarity index 98%
rename from metadata/md5-cache/kde-frameworks/kio-5.70.0
rename to metadata/md5-cache/kde-frameworks/kio-5.70.0-r1
index 7982ed25975b..2de299a8aaa3 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.70.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kio-5.70.0.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc61a352c73146e51b887e815869659f
+_md5_=362e2be1f8871e79e429aa7759a4c883
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.70.0 b/metadata/md5-cache/kde-frameworks/plasma-5.70.1
similarity index 99%
rename from metadata/md5-cache/kde-frameworks/plasma-5.70.0
rename to metadata/md5-cache/kde-frameworks/plasma-5.70.1
index b535b29d4ac0..54c49b23f8a6 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.70.1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2-only=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kactivities-5.70*:5 =kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kdeclarative-5.70*:5 =kde-frameworks/kglobalaccel-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kirigami-5.70*:5 =kde-frameworks/knotifications-5.70*:5 =kde-frameworks/kpackage-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.70*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
-SRC_URI=mirror://kde/stable/frameworks/5.70/plasma-framework-5.70.0.tar.xz
+SRC_URI=mirror://kde/stable/frameworks/5.70/plasma-framework-5.70.1.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ccbf1a8934c491e1d998d724e28d980
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 560e94811038..eb6d6295354b 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1
index 2d41e21543fd..3ccdae55c9e0 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=wayland? ( || ( gles2-only opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0269eabed0769871e01185286593345
+_md5_=2e18a33a147c4dc800ec91cd14752f05
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
index 74076cb12687..0a890fd6b6a4 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
@@ -12,4 +12,4 @@ REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	596b871a241e5fd1e87395541c8831a9	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e81db2567aaed27e46350844e40546e
+_md5_=945d85aab7f9984eb623bac353e9e9a4
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index bd429db00b24..b9cd5c36d82c 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/alpine-2.22-r1 b/metadata/md5-cache/mail-client/alpine-2.22-r1
index 0b8b4de518f9..93e0fd14ab42 100644
--- a/metadata/md5-cache/mail-client/alpine-2.22-r1
+++ b/metadata/md5-cache/mail-client/alpine-2.22-r1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-n
 SLOT=0
 SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.22.tar.xz chappa? ( http://alpine.x10host.com/alpine/patches/alpine-2.22/all.patch.gz -> alpine-2.22-chappa.patch.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24a760a96f6c8953871fa5df22fd2771
+_md5_=30bd77785eb72ad390ecff941dc8bdc5
diff --git a/metadata/md5-cache/mail-client/mutt-1.14.0 b/metadata/md5-cache/mail-client/mutt-1.14.0-r1
similarity index 69%
rename from metadata/md5-cache/mail-client/mutt-1.14.0
rename to metadata/md5-cache/mail-client/mutt-1.14.0-r1
index ecd94f96fef4..db37ec77d3dd 100644
--- a/metadata/md5-cache/mail-client/mutt-1.14.0
+++ b/metadata/md5-cache/mail-client/mutt-1.14.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
-IUSE=berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
+IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) )
+RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.14.0.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.0.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.14.0-patches-r0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f57ebc789ab401a6ce8d820b3a022540
+_md5_=df1334c0b75741068d7b1034dbca55df
diff --git a/metadata/md5-cache/mail-client/roundcube-1.3.11 b/metadata/md5-cache/mail-client/roundcube-1.3.11
index 327a89bf9062..088478093642 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.3.11
+++ b/metadata/md5-cache/mail-client/roundcube-1.3.11
@@ -4,11 +4,11 @@ DESCRIPTION=A browser-based multilingual IMAP client with an application-like us
 EAPI=7
 HOMEPAGE=https://roundcube.net
 IUSE=change-password enigma ldap managesieve mysql postgres sqlite ssl spell vhosts
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
 RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] >=dev-php/PEAR-Auth_SASL-1.1.0 >=dev-php/PEAR-Mail_Mime-1.10.0 >=dev-php/PEAR-Mail_mimeDecode-1.5.5 >=dev-php/PEAR-Net_IDNA2-0.2.0 >=dev-php/PEAR-Net_SMTP-1.7.1 virtual/httpd-php change-password? ( >=dev-php/PEAR-Net_Socket-1.2.1 dev-lang/php[sockets] ) enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg ) ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 ) managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.3.11
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.3.11/roundcubemail-1.3.11-complete.tar.gz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a575479c44e9cdd5987c3c9d3d2cc98
+_md5_=1ff6a737233e452df28e455378a926a0
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 03877b3a8cfc..c1d12535f4ba 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/exim-geoip-0.1 b/metadata/md5-cache/mail-filter/exim-geoip-0.1-r1
similarity index 95%
rename from metadata/md5-cache/mail-filter/exim-geoip-0.1
rename to metadata/md5-cache/mail-filter/exim-geoip-0.1-r1
index f0854d74f988..6551e91bbac0 100644
--- a/metadata/md5-cache/mail-filter/exim-geoip-0.1
+++ b/metadata/md5-cache/mail-filter/exim-geoip-0.1-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/geoip mail-mta/exim[dlfunc]
 SLOT=0
 SRC_URI=http://dist.epipe.com/exim/exim-geoipv6-dlfunc-0.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9adb38f0243a03034936463d7c96419
+_md5_=8be8522e7a2ab785e3c55ce93ead3434
diff --git a/metadata/md5-cache/mail-filter/exim-p0f-0.1 b/metadata/md5-cache/mail-filter/exim-p0f-0.1-r1
similarity index 95%
rename from metadata/md5-cache/mail-filter/exim-p0f-0.1
rename to metadata/md5-cache/mail-filter/exim-p0f-0.1-r1
index f668a3de1bf8..e170029bb507 100644
--- a/metadata/md5-cache/mail-filter/exim-p0f-0.1
+++ b/metadata/md5-cache/mail-filter/exim-p0f-0.1-r1
@@ -9,4 +9,4 @@ RDEPEND=>=net-analyzer/p0f-3.05_beta mail-mta/exim[dlfunc]
 SLOT=0
 SRC_URI=http://dist.epipe.com/exim/exim-p0f3-dlfunc-0.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25e536f8f6522d5566cc762119ab4dbd
+_md5_=96ba06b2bd03f4fa1136cb264f0225c8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 59d92b7f6312..2e9a9571d41f 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r5 b/metadata/md5-cache/media-gfx/fontforge-20170731-r5
deleted file mode 100644
index b107ac98fefb..000000000000
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup
-DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto )
-DESCRIPTION=postscript font editor and converter
-EAPI=6
-HOMEPAGE=http://fontforge.github.io/
-IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X +python_single_target_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD GPL-3+
-RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] )
-REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python3_6 ) ) test? ( png python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d12288bde602397fadbcd98f57f4c3e
diff --git a/metadata/md5-cache/media-gfx/fontforge-20190801 b/metadata/md5-cache/media-gfx/fontforge-20190801
deleted file mode 100644
index 01517a7ce837..000000000000
--- a/metadata/md5-cache/media-gfx/fontforge-20190801
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=postscript font editor and converter
-EAPI=7
-HOMEPAGE=http://fontforge.github.io/
-IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD GPL-3+
-RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] )
-REQUIRED_USE=cairo? ( png ) gtk? ( cairo ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c68d4898566e887c02390156ff7ff723
diff --git a/metadata/md5-cache/media-gfx/fontforge-20200314 b/metadata/md5-cache/media-gfx/fontforge-20200314
index e16e5ed6c2d6..6bb1cb27e069 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20200314
+++ b/metadata/md5-cache/media-gfx/fontforge-20200314
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext doc? ( dev-python/sphinx ) 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] ) ) test? ( dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) ) dev-util/ninja dev-util/cmake
+BDEPEND=sys-devel/gettext doc? ( >=dev-python/sphinx-2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) test? ( dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=dev-libs/glib:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:0= x11-libs/libXi:0= ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) woff2? ( media-libs/woff2:0= ) !gtk? ( X? ( x11-base/xorg-proto ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=postscript font editor and converter
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20200314/fontforge-20200314.tar.xz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ee72a019a43a47acea4bfaf38e413e7
+_md5_=225b9c234cbb41def21b325090450e65
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.7 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.7
deleted file mode 100644
index 2ff7390ddd1b..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv ) !test? ( test )
-SLOT=0/6.9.11
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-7.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3996e7f063ede8587d8c086e39cc91e1
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
index 5dac9a7843e7..a5b4a1469309 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv ) !test? ( test )
 SLOT=0/6.9.11
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-9.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=032d990205dc20cb5d0a14eef10a5a6a
+_md5_=3996e7f063ede8587d8c086e39cc91e1
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.7-r1 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.7-r1
deleted file mode 100644
index 8d3b6d5c29fb..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.0.10
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-7.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ffd9a7c7f5af99fe1eb48b3264a4fa73
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
index 293347d5e8fd..238b6f33fce8 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.0.10
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-9.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a3938d9325d00930f04e54db5078f307
+_md5_=ffd9a7c7f5af99fe1eb48b3264a4fa73
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 839bc9a1039a..c68af54a00f3 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/exiftool-11.99 b/metadata/md5-cache/media-libs/exiftool-11.99
new file mode 100644
index 000000000000..95ff6b47e1dd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-11.99
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=7
+HOMEPAGE=https://exiftool.org/
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://exiftool.org/Image-ExifTool-11.99.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=55b8937e283fe62aae20f67b7af21f1a
diff --git a/metadata/md5-cache/media-libs/gd-2.3.0 b/metadata/md5-cache/media-libs/gd-2.3.0
index 5154de7519da..ff773ea618ea 100644
--- a/metadata/md5-cache/media-libs/gd-2.3.0
+++ b/metadata/md5-cache/media-libs/gd-2.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Graphics library for fast image creation
 EAPI=7
 HOMEPAGE=https://libgd.org/ https://www.boutell.com/gd/
 IUSE=cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.3.0/libgd-2.3.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0ca632bf9d1c2aad1403c80b659094b2
+_md5_=b3e747cf41679519714f5026eab0ea18
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.6 b/metadata/md5-cache/media-libs/harfbuzz-2.6.6
new file mode 100644
index 000000000000..81f339d31ccd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/0.9.18
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/2.6.6/harfbuzz-2.6.6.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b9277c91a654b7f9827122469ba69d8c
diff --git a/metadata/md5-cache/media-libs/libdvdnav-6.0.0 b/metadata/md5-cache/media-libs/libdvdnav-6.0.0
index 848243a1c742..b5cce8b4dc92 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-6.0.0
+++ b/metadata/md5-cache/media-libs/libdvdnav-6.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libdvdread-5.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/libdvdread-5.0.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Library for DVD navigation tools
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-5.0.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(-)?]
+RDEPEND=>=media-libs/libdvdread-5.0.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(-)?]
 SLOT=0
 SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdnav/6.0.0/libdvdnav-6.0.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1ce752e5a9f4385d9e48a54e5d4d99d9
+_md5_=5ef2ca98dd4189a5f6c8d278c14eb872
diff --git a/metadata/md5-cache/media-libs/libdvdnav-6.0.1 b/metadata/md5-cache/media-libs/libdvdnav-6.0.1
index c34338e04fb0..48b60ceba815 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-6.0.1
+++ b/metadata/md5-cache/media-libs/libdvdnav-6.0.1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library for DVD navigation tools
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc006f1bbd85281cae8126af58fb0af1
+_md5_=307833343411fe0d8281559e2afd8e28
diff --git a/metadata/md5-cache/media-libs/libdvdnav-6.1.0 b/metadata/md5-cache/media-libs/libdvdnav-6.1.0
index c212f34f8156..eabc523ab76c 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-6.1.0
+++ b/metadata/md5-cache/media-libs/libdvdnav-6.1.0
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library for DVD navigation tools
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdnav/6.1.0/libdvdnav-6.1.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc006f1bbd85281cae8126af58fb0af1
+_md5_=307833343411fe0d8281559e2afd8e28
diff --git a/metadata/md5-cache/media-libs/libdvdnav-9999 b/metadata/md5-cache/media-libs/libdvdnav-9999
index 99d77a41e36e..289180768583 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-9999
+++ b/metadata/md5-cache/media-libs/libdvdnav-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library for DVD navigation tools
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvdnav.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=media-libs/libdvdread-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdvdread-6.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc006f1bbd85281cae8126af58fb0af1
+_md5_=307833343411fe0d8281559e2afd8e28
diff --git a/metadata/md5-cache/media-libs/libdvdread-6.1.0 b/metadata/md5-cache/media-libs/libdvdread-6.1.1
similarity index 95%
rename from metadata/md5-cache/media-libs/libdvdread-6.1.0
rename to metadata/md5-cache/media-libs/libdvdread-6.1.1
index b6ef01fe65b0..a0a35e5af8bf 100644
--- a/metadata/md5-cache/media-libs/libdvdread-6.1.0
+++ b/metadata/md5-cache/media-libs/libdvdread-6.1.1
@@ -8,7 +8,7 @@ IUSE=+css static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/7
-SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdread/6.1.0/libdvdread-6.1.0.tar.bz2
+SLOT=0/8
+SRC_URI=https://downloads.videolan.org/pub/videolan/libdvdread/6.1.1/libdvdread-6.1.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bef00ef455775ea16ab65cef23640d2e
+_md5_=17aa8af2c579b399e43062de305c8eca
diff --git a/metadata/md5-cache/media-libs/libdvdread-9999 b/metadata/md5-cache/media-libs/libdvdread-9999
index 013a5c30edee..849086f935d0 100644
--- a/metadata/md5-cache/media-libs/libdvdread-9999
+++ b/metadata/md5-cache/media-libs/libdvdread-9999
@@ -8,6 +8,6 @@ IUSE=+css static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=css? ( >=media-libs/libdvdcss-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/7
+SLOT=0/8
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bef00ef455775ea16ab65cef23640d2e
+_md5_=17aa8af2c579b399e43062de305c8eca
diff --git a/metadata/md5-cache/media-libs/libprojectm-3.1.3 b/metadata/md5-cache/media-libs/libprojectm-3.1.3
index ec0de7a8ff26..577b24eba41c 100644
--- a/metadata/md5-cache/media-libs/libprojectm-3.1.3
+++ b/metadata/md5-cache/media-libs/libprojectm-3.1.3
@@ -11,4 +11,4 @@ RDEPEND=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] j
 SLOT=0/2
 SRC_URI=https://github.com/projectM-visualizer/projectm/archive/v3.1.3.tar.gz -> libprojectm-3.1.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b7a08bd4c4069865923694373399f717
+_md5_=2b221f03f1d4c0c7f1e21bcf4c3f050f
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430
index d573f3da3d8e..1bf3630e73a4 100644
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430
@@ -5,11 +5,11 @@ DESCRIPTION=VoIP library for Telegram clients
 EAPI=7
 HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
 IUSE=+alsa +dsp libressl pulseaudio
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Unlicense
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/opus:= alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/a045c9eea47b371c0c514c72c76172a211c894cb.tar.gz -> libtgvoip-2.4.4_p20200430.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70a8397511666de44a7dfcf8b427d0ed
+_md5_=dbd33c5133549cf6edb7d840799808dd
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.7 b/metadata/md5-cache/media-libs/mesa-20.0.7
new file mode 100644
index 000000000000..0d73f9d2f931
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-20.0.7
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.0.7.tar.xz
+_eclasses_=llvm	8f3e93d3465cc38eb38d404e0c799ccd	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bdaa6a217228f99b022904db5c4977a0
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.0_rc3 b/metadata/md5-cache/media-libs/mesa-20.1.0_rc3
new file mode 100644
index 000000000000..168f82fac87a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-20.1.0_rc3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.1.0-rc3.tar.xz
+_eclasses_=llvm	8f3e93d3465cc38eb38d404e0c799ccd	meson	991e544bbaf3120073ededbdc1d8bf93	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bdaa6a217228f99b022904db5c4977a0
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index dc305aefec29..fc4bb2ee1e1b 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srt-1.16.2 b/metadata/md5-cache/media-plugins/gst-plugins-srt-1.16.2
new file mode 100644
index 000000000000..5a947c3d0f22
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srt-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=net-libs/srt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Secure reliable transport (SRT) transfer plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=net-libs/srt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.16.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	0dbe44045f0102b098242bfa9b95d474	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d789fe304aa2630b1abdbcafc430a81
diff --git a/metadata/md5-cache/media-plugins/live-2017.10.28 b/metadata/md5-cache/media-plugins/live-2017.10.28
deleted file mode 100644
index e4ff0378008b..000000000000
--- a/metadata/md5-cache/media-plugins/live-2017.10.28
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
-EAPI=5
-HOMEPAGE=http://www.live555.com/
-IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-SLOT=0/7
-SRC_URI=http://www.live555.com/liveMedia/public/live.2017.10.28.tar.gz mirror://gentoo/live.2017.10.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=592a5b9359f42e99c5d751430333b889
diff --git a/metadata/md5-cache/media-plugins/live-2018.01.29 b/metadata/md5-cache/media-plugins/live-2018.01.29
deleted file mode 100644
index 91eca836fade..000000000000
--- a/metadata/md5-cache/media-plugins/live-2018.01.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
-EAPI=5
-HOMEPAGE=http://www.live555.com/
-IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-SLOT=0/7
-SRC_URI=http://www.live555.com/liveMedia/public/live.2018.01.29.tar.gz mirror://gentoo/live.2018.01.29.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3643c42da209680016e00637d1e6926a
diff --git a/metadata/md5-cache/media-plugins/live-2018.07.07 b/metadata/md5-cache/media-plugins/live-2018.07.07
deleted file mode 100644
index 65b3aa2ecd59..000000000000
--- a/metadata/md5-cache/media-plugins/live-2018.07.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
-EAPI=5
-HOMEPAGE=http://www.live555.com/
-IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-SLOT=0/7
-SRC_URI=http://www.live555.com/liveMedia/public/live.2018.07.07.tar.gz mirror://gentoo/live.2018.07.07.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3643c42da209680016e00637d1e6926a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 94c92fef635f..cf90db704b29 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/mkvtoolnix-46.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-46.0.0
new file mode 100644
index 000000000000..19ef7ac75c58
--- /dev/null
+++ b/metadata/md5-cache/media-video/mkvtoolnix-46.0.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/boost-1.60:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tools to create, alter, and inspect Matroska files
+EAPI=7
+HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
+IUSE=debug nls pch test qt5
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.60:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-46.0.0.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91632d046eb7bb0e04a724ad4573cf73
diff --git a/metadata/md5-cache/media-video/obs-studio-25.0.8 b/metadata/md5-cache/media-video/obs-studio-25.0.8-r1
similarity index 98%
rename from metadata/md5-cache/media-video/obs-studio-25.0.8
rename to metadata/md5-cache/media-video/obs-studio-25.0.8-r1
index fa58ec986285..b4a772ce7e96 100644
--- a/metadata/md5-cache/media-video/obs-studio-25.0.8
+++ b/metadata/md5-cache/media-video/obs-studio-25.0.8-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/25.0.8.tar.gz -> obs-studio-25.0.8.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3ba11a6bc84cb85b63b5db48c1fe411
+_md5_=4a9aa5f44076421fdf1065f8a89f680d
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index de4e39af83a0..c7b5f30d27f0 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8921dd951342eecb7e782537fe02944
+_md5_=fea42c45510d34fbeb6737ede91fab1b
diff --git a/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012 b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012
new file mode 100644
index 000000000000..4274a61aa31b
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-video/obs-studio-25.0.8-r1 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5
+DESCRIPTION=obs studio output plugin for Video4Linux2 device
+EAPI=7
+HOMEPAGE=https://github.com/CatxFish/obs-v4l2sink
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/obs-studio-25.0.8-r1 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/CatxFish/obs-v4l2sink/archive/1ec3c8ada0e1040d867ce567f177be55cd278378.tar.gz -> obs-v4l2sink-0.1.0_p20181012.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93ee396f8d1c2d09bb2dfbafe899e155
diff --git a/metadata/md5-cache/media-video/vidcutter-6.0.0 b/metadata/md5-cache/media-video/vidcutter-6.0.0
new file mode 100644
index 000000000000..71f915d04ba1
--- /dev/null
+++ b/metadata/md5-cache/media-video/vidcutter-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-video/mpv-0.25[libmpv]
+DESCRIPTION=FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI
+EAPI=7
+HOMEPAGE=http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/mediainfo virtual/ffmpeg[X,encode] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ozmartian/vidcutter/archive/6.0.0.tar.gz -> vidcutter-6.0.0.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=af0465086b2ea3af8ee8636b430dd79d
diff --git a/metadata/md5-cache/media-video/vidcutter-9999 b/metadata/md5-cache/media-video/vidcutter-9999
new file mode 100644
index 000000000000..0844714bcfe5
--- /dev/null
+++ b/metadata/md5-cache/media-video/vidcutter-9999
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=media-video/mpv-0.25[libmpv]
+DESCRIPTION=FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI
+EAPI=7
+HOMEPAGE=http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/mediainfo virtual/ffmpeg[X,encode] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=af0465086b2ea3af8ee8636b430dd79d
diff --git a/metadata/md5-cache/media-video/vlc-3.0.8-r1 b/metadata/md5-cache/media-video/vlc-3.0.8-r1
deleted file mode 100644
index 699f94836bfe..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=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 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass 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_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=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 )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da39f84dfe98d0facfc1066e7925fb90
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6ef98131a2e8..1f5a74e83d8a 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/thcrut-1.2.5-r1 b/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
index bbf3da719e14..00fd75cbeb89 100644
--- a/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
+++ b/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
@@ -6,6 +6,6 @@ HOMEPAGE=http://www.thc.org/thc-rut/
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=free-noncomm PCRE GPL-1+
 SLOT=0
-SRC_URI=http://www.thc.org/thc-rut/thcrut-1.2.5.tar.gz
+SRC_URI=https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/thcrut-1.2.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2457f0b1e94b48549508aecd764e47c4
+_md5_=b997aa41b6d877e454b80cf444b6409e
diff --git a/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2 b/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
index 998900ed509e..a7f8aefee151 100644
--- a/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
+++ b/metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=free-noncomm PCRE GPL-1+
 RDEPEND=dev-libs/libpcre net-libs/libnet:1.0 net-libs/libpcap
 SLOT=0
-SRC_URI=http://www.thc.org/thc-rut/thcrut-1.2.5.tar.gz
+SRC_URI=https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/thcrut-1.2.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=85fd1ace8bb7d2a9661f5d092ddb6cf2
+_md5_=40fab2a1cbf410b6095b99a741e1140e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.18 b/metadata/md5-cache/net-analyzer/zabbix-4.0.18
deleted file mode 100644
index 5c6e1cece951..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/4.0.18/zabbix-4.0.18.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=927449d6e713d47f2b67699f8494a0a4
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.4.6 b/metadata/md5-cache/net-analyzer/zabbix-4.4.6
deleted file mode 100644
index 91ddda8ca8e4..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/4.4.6/zabbix-4.4.6.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=040ee2da68df059cfbd0ad46e48ea263
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index ccdd738c15fa..75048c3e894c 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/dnsmasq-2.81 b/metadata/md5-cache/net-dns/dnsmasq-2.81
index e9c9764df10b..8148ee830512 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.81
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.81
@@ -5,11 +5,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=7
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.81.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4107a4de444019d32f0bade7b8f6857
+_md5_=a7f00358d965842b4364f3ec402ff93e
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 82608d632bbc..165e1106aa70 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.11.8 b/metadata/md5-cache/net-fs/samba-4.11.8
index 3b42d6dd0255..bdf4debf011a 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.8
+++ b/metadata/md5-cache/net-fs/samba-4.11.8
@@ -4,7 +4,7 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.10[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.1.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	ed97304af323c7b2f6934f229982cb7d	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=d65c907042230cb46d0de5b6df04fac8
+_md5_=92438c82472143ba5d7c4b9ac1c2f0b8
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 742f21a8a95d..1a57d5039690 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/signal-desktop-bin-1.33.4 b/metadata/md5-cache/net-im/signal-desktop-bin-1.34.0
similarity index 90%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.33.4
rename to metadata/md5-cache/net-im/signal-desktop-bin-1.34.0
index 44c78bef4ca2..fc1d4d639a47 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.33.4
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.34.0
@@ -8,6 +8,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=dev-libs/nss media-libs/mesa[X(+)] net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.33.4_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.34.0_amd64.deb
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27467af3a0f2b43fddb5477c0f693991
+_md5_=25d90ad8cc83925b3faceb282c1a24e7
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.12-r2 b/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
index db2f2d2c89be..24db2efb91a7 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.12-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.12.tar.gz -> spectrum2-2.0.12.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9e7654795bebbe74f7baecb0287356d
+_md5_=d63ad812e10c7438fb0e4a6d7c6b4df4
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.0 b/metadata/md5-cache/net-im/telegram-desktop-2.1.0
index e58116f47d24..d26d51895ab8 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.1.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Official desktop client for Telegram
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
 IUSE=+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-3-with-openssl-exception
 RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= >=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] media-libs/opus:= media-video/ffmpeg:=[alsa?,opus,pulseaudio?] sys-libs/zlib[minizip] virtual/libiconv dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa pulseaudio ) || ( X wayland ) spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.0/tdesktop-2.1.0-full.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9581a3b757a8ae307c7cd64ef470e7f
+_md5_=e065e91f0defcd271279a53bedd562f6
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.6 b/metadata/md5-cache/net-im/telegram-desktop-2.1.6
new file mode 100644
index 000000000000..7e59f2e861c2
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) !net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-cpp/range-v3 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= >=media-libs/libtgvoip-2.4.4_p20200430[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] media-libs/opus:= media-video/ffmpeg:=[alsa?,opus,pulseaudio?] sys-libs/zlib[minizip] virtual/libiconv dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-cpp/range-v3 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= >=media-libs/libtgvoip-2.4.4_p20200430[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] media-libs/opus:= media-video/ffmpeg:=[alsa?,opus,pulseaudio?] sys-libs/zlib[minizip] virtual/libiconv dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio ) || ( X wayland ) spell? ( ^^ ( enchant hunspell ) )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.6/tdesktop-2.1.6-full.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e9b1bd716a4163cae78e3cedc4b3645
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 9e18016366e7..afdf59b0b59d 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/libhubbub-0.3.6 b/metadata/md5-cache/net-libs/libhubbub-0.3.6
index a1111f24dd7b..0678a9cfc100 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.6
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.6
@@ -5,11 +5,11 @@ DESCRIPTION=HTML5 compliant parsing library, written in C
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org/projects/hubbub/
 IUSE=doc test
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~m68k-mint
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~m68k-mint
 LICENSE=MIT
 RDEPEND=dev-libs/libparserutils:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.6-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7943cf986398cddf0165cb748aa679ca
+_md5_=a51209cafd46c425d46544d99b6c618d
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.0.7 b/metadata/md5-cache/net-libs/libwebsockets-4.0.7
index 370ef9122517..4dfeb926d448 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.0.7
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.0.7
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl static-libs threads zip
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !libressl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( >net-libs/mbedtls-2.0.0 ) ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) ssl? ( ?? ( libressl mbedtls ) ) ?? ( libev libevent )
 SLOT=0/16
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.0.7.tar.gz -> libwebsockets-4.0.7.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae7471ab6629288613fc7bf8eea4a71e
+_md5_=82f669705f8914359ec9e7ddc60aaa25
diff --git a/metadata/md5-cache/net-libs/srt-1.3.2-r1 b/metadata/md5-cache/net-libs/srt-1.3.2-r1
index 268b286ade72..9165c1b5d805 100644
--- a/metadata/md5-cache/net-libs/srt-1.3.2-r1
+++ b/metadata/md5-cache/net-libs/srt-1.3.2-r1
@@ -1,7 +1,7 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protocol (SRTP)
+DESCRIPTION=Secure Reliable Transport (SRT) library and tools
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls 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
@@ -11,4 +11,4 @@ RDEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.3.2.tar.gz -> srt-1.3.2.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e22aa699e0752517472f572f550c3ada
+_md5_=114a98026f04f19067e1f0719f7d9f1f
diff --git a/metadata/md5-cache/net-libs/srt-1.4.0-r1 b/metadata/md5-cache/net-libs/srt-1.4.0-r1
index 168bd7aa8968..021bb16c7d8c 100644
--- a/metadata/md5-cache/net-libs/srt-1.4.0-r1
+++ b/metadata/md5-cache/net-libs/srt-1.4.0-r1
@@ -1,7 +1,7 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protocol (SRTP)
+DESCRIPTION=Secure Reliable Transport (SRT) library and tools
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls 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
@@ -11,4 +11,4 @@ RDEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.4.0.tar.gz -> srt-1.4.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=713b513d1ac8f7b656ff78672fde5061
+_md5_=cf538d11075424ce52e8b03809eddae4
diff --git a/metadata/md5-cache/net-libs/srt-1.4.1-r1 b/metadata/md5-cache/net-libs/srt-1.4.1-r1
index 7a510f4ba651..f4c75c9fba0c 100644
--- a/metadata/md5-cache/net-libs/srt-1.4.1-r1
+++ b/metadata/md5-cache/net-libs/srt-1.4.1-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protocol (SRTP)
+DESCRIPTION=Secure Reliable Transport (SRT) library and tools
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MPL-2.0
 RDEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.4.1.tar.gz -> srt-1.4.1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=713b513d1ac8f7b656ff78672fde5061
+_md5_=ab34c4efad77017e1f212fb389b69560
diff --git a/metadata/md5-cache/net-libs/srt-9999 b/metadata/md5-cache/net-libs/srt-9999
index 2d10bc09fbca..45ebb518ad02 100644
--- a/metadata/md5-cache/net-libs/srt-9999
+++ b/metadata/md5-cache/net-libs/srt-9999
@@ -1,7 +1,7 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/gnutls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( dev-cpp/gtest )
-DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protocol (SRTP)
+DESCRIPTION=Secure Reliable Transport (SRT) library and tools
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls libressl 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
@@ -11,4 +11,4 @@ RDEPEND=gnutls? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef7063f59e314bd1fe6933a30921aa0
+_md5_=e781668d74b9d66e817f6c9361bc401d
diff --git a/metadata/md5-cache/net-libs/wandio-4.2.3_p1 b/metadata/md5-cache/net-libs/wandio-4.2.3_p1
new file mode 100644
index 000000000000..37b75d81fda3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/wandio-4.2.3_p1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare test
+DEPEND=!<net-libs/libtrace-4 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) http? ( net-misc/curl ) zlib? ( sys-libs/zlib ) test? ( app-arch/lzop )
+DESCRIPTION=C library for simple and efficient file IO
+EAPI=7
+HOMEPAGE=https://research.wand.net.nz/software/libwandio.php
+IUSE=bzip2 http lzma lzo static-libs test zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!<net-libs/libtrace-4 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) http? ( net-misc/curl ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://github.com/wanduow/wandio/archive/4.2.3-1.tar.gz -> wandio-4.2.3_p1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2f90a35c4d966b71f8ae7aaf2e3870fd
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.28.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.28.1
deleted file mode 100644
index 5e9cbf5c5505..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.28.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.28.1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=59c5c454177bb5016021f0dce0eb48e5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.28.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
index 2cd957e116cd..7ff4f7114510 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.28.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.28.2.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c95efb0288509b17cb9ae824df4b2f7
+_md5_=3cb08c2485aa3f4a15512fd3380a3b3e
diff --git a/metadata/md5-cache/net-libs/xrootd-4.12.1 b/metadata/md5-cache/net-libs/xrootd-4.12.1
new file mode 100644
index 000000000000..5fb80ccbdd1a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Extended ROOT remote file server
+EAPI=7
+HOMEPAGE=http://xrootd.org/
+IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://xrootd.org/download/v4.12.1/xrootd-4.12.1.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a8363af506b9c92b34543c36775b5f7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5e9d875abae3..af1f0451224d 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/asterisk-13.32.0-r1 b/metadata/md5-cache/net-misc/asterisk-13.32.0-r1
deleted file mode 100644
index 1189b9bb5030..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-13.32.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.32.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ce0c23ecf5d52798e81c44cf90c1279f
diff --git a/metadata/md5-cache/net-misc/asterisk-16.9.0 b/metadata/md5-cache/net-misc/asterisk-16.9.0
deleted file mode 100644
index f409c1d3f40a..000000000000
--- a/metadata/md5-cache/net-misc/asterisk-16.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
-DESCRIPTION=Asterisk: A Modular Open Source PBX System
-EAPI=7
-HOMEPAGE=https://www.asterisk.org/
-IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
-REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
-SLOT=0
-SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.9.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c1680144940a559f184fbbbed0c4f47d
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.6 b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
new file mode 100644
index 000000000000..d2ac20574cd6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst setup unpack
+DESCRIPTION=Standard networking plugins for container networking
+EAPI=7
+HOMEPAGE=https://github.com/containernetworking/plugins
+IUSE=hardened kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.6.tar.gz -> cni-plugins-0.8.6.tar.gz
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=560a83ff33268801be6d25180f7b99fa
diff --git a/metadata/md5-cache/net-misc/dropbox-97.4.467 b/metadata/md5-cache/net-misc/dropbox-97.4.467
new file mode 100644
index 000000000000..1954d4f5b7ad
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-97.4.467
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=+librsync-bundled selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( dev-libs/glib:2 media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/libffi-compat:6 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib sys-libs/ncurses-compat:5
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-97.4.467.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-97.4.467.tar.gz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2af051a87d6d9d6d2a797b4fab1582ae
diff --git a/metadata/md5-cache/net-misc/endlessh-1.1 b/metadata/md5-cache/net-misc/endlessh-1.1
index 62459c3a0889..45d906e048d5 100644
--- a/metadata/md5-cache/net-misc/endlessh-1.1
+++ b/metadata/md5-cache/net-misc/endlessh-1.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=SSH tarpit that slowly sends and endless banner
 EAPI=7
 HOMEPAGE=https://github.com/skeeto/endlessh
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/skeeto/endlessh/archive/1.1.tar.gz -> endlessh-1.1.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=494692ffd83ac791062f019dbcdacc96
+_md5_=83745686c383bc8b69c3d084f7085356
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0-r1
deleted file mode 100644
index df284763b679..000000000000
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig client? ( X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
-DESCRIPTION=Free implementation of the Remote Desktop Protocol
-EAPI=7
-HOMEPAGE=http://www.freerdp.com/
-IUSE=alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb2126dbc1031ec42368e5312758e1ed
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.2 b/metadata/md5-cache/net-misc/memcached-1.6.2
deleted file mode 100644
index e78fe751a1ce..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )
-DESCRIPTION=High-performance, distributed memory object caching system
-EAPI=7
-HOMEPAGE=http://memcached.org/
-IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.6.2.tar.gz https://www.memcached.org/files/old/memcached-1.6.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3fd5b9827125e443346ef1f8caeeb11d
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.3 b/metadata/md5-cache/net-misc/memcached-1.6.3
deleted file mode 100644
index b2f92eadb53d..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )
-DESCRIPTION=High-performance, distributed memory object caching system
-EAPI=7
-HOMEPAGE=http://memcached.org/
-IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.6.3.tar.gz https://www.memcached.org/files/old/memcached-1.6.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3fd5b9827125e443346ef1f8caeeb11d
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.5 b/metadata/md5-cache/net-misc/memcached-1.6.6
similarity index 79%
rename from metadata/md5-cache/net-misc/memcached-1.6.5
rename to metadata/md5-cache/net-misc/memcached-1.6.6
index ff6f0ea86e4e..323026360fc7 100644
--- a/metadata/md5-cache/net-misc/memcached-1.6.5
+++ b/metadata/md5-cache/net-misc/memcached-1.6.6
@@ -5,11 +5,11 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=7
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.6.5.tar.gz https://www.memcached.org/files/old/memcached-1.6.5.tar.gz
+SRC_URI=https://www.memcached.org/files/memcached-1.6.6.tar.gz https://www.memcached.org/files/old/memcached-1.6.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7bcfd86b46e48c2fd67e9c164805ff91
+_md5_=7989ef74056dbc449a9c5cb82f5804ea
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
new file mode 100644
index 000000000000..7b980755e9ba
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20200510.tar.gz
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c2b48103e8a113312b4849e39e77efa4
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 66ee18c2cf96..ba2238722e55 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/syncthing-1.5.0 b/metadata/md5-cache/net-p2p/syncthing-1.5.0
new file mode 100644
index 000000000000..0377d3be5b46
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=7
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~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.5.0.tar.gz -> syncthing-1.5.0.tar.gz 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/!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/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/calmh/murmur3/@v/v1.1.1-0.20200226160057-74e9af8f47ac.zip -> github.com%2Fcalmh%2Fmurmur3%2F@v%2Fv1.1.1-0.20200226160057-74e9af8f47ac.zip mirror://goproxy//github.com/calmh/murmur3/@v/v1.1.1-0.20200226160057-74e9af8f47ac.mod -> github.com%2Fcalmh%2Fmurmur3%2F@v%2Fv1.1.1-0.20200226160057-74e9af8f47ac.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/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/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/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/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/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-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-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/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/mock/@v/v1.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/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.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.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/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/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/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%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/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/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/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.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/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.14.4.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.14.4.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.14.4.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.14.4.mod mirror://goproxy//github.com/marten-seemann/chacha20/@v/v0.2.0.zip -> github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/marten-seemann/chacha20/@v/v0.2.0.mod -> github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.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.4.1.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.4.1.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.4.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/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/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/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/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/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/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.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.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-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/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/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/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/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/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/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/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/twmb/murmur3/@v/v1.1.3.zip -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.3.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.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/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/willf/bitset/@v/v1.1.10.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.10.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/willf/bloom/@v/v2.0.3+incompatible.zip -> github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/willf/bloom/@v/v2.0.3+incompatible.mod -> github.com%2Fwillf%2Fbloom%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//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-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-20190829043050-9756ffdc2472.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190829043050-9756ffdc2472.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190829043050-9756ffdc2472.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190829043050-9756ffdc2472.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/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-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-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-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-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/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/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-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.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-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-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.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/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.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-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.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//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/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/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
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06bd78fe7f0c9c0fd65539a3a33d4f8f
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index cc1bd8fe9604..03f5025e5b35 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/cnijfilter2-5.80 b/metadata/md5-cache/net-print/cnijfilter2-5.80
new file mode 100644
index 000000000000..495ab0250bec
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.80
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+DESCRIPTION=IJ Printer Driver
+EAPI=7
+HOMEPAGE=https://www.canon.it/
+KEYWORDS=~amd64 ~x86
+LICENSE=Canon-IJ
+RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/3/0100010273/01/cnijfilter2-source-5.80-1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0bae354ffd66c4705b2d907fb0ac0c1e
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 52acfd0ed8ea..51f770e0207c 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/ocserv-1.0.1 b/metadata/md5-cache/net-vpn/ocserv-1.0.1
index 5a1f6e5fa5c9..3b97f6851be2 100644
--- a/metadata/md5-cache/net-vpn/ocserv-1.0.1
+++ b/metadata/md5-cache/net-vpn/ocserv-1.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Openconnect SSL VPN server
 EAPI=7
 HOMEPAGE=https://ocserv.gitlab.io/www/index.html
 IUSE=geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=ftp://ftp.infradead.org/pub/ocserv/ocserv-1.0.1.tar.xz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2876113b39b7cf29c8f56a470c859dd5
+_md5_=9eb446cec49d92e7f2f8b4cdc48fd0c3
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.09-r1 b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
index dde537cf5a43..a21bfe053123 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.09-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=7
 HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test kernel_linux
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
 _eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3b460a4d715c68dbdbe593d16b16c620
+_md5_=4f24eebe589b802d1ee9750b7aa9a804
diff --git a/metadata/md5-cache/net-vpn/tailscale-0.97_p45 b/metadata/md5-cache/net-vpn/tailscale-0.97_p45
deleted file mode 100644
index 8b25ab7204cb..000000000000
--- a/metadata/md5-cache/net-vpn/tailscale-0.97_p45
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Tailscale vpn client
-EAPI=7
-HOMEPAGE=https://tailscale.com
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=net-firewall/iptables virtual/tmpfiles
-SLOT=0
-SRC_URI=amd64? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_amd64.tgz ) arm? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_arm.tgz ) arm64? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_arm64.tgz ) x86? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_386.tgz )
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34e1630abf68f6aa0a4f0b13dadc201c
diff --git a/metadata/md5-cache/net-vpn/tailscale-0.98_p0 b/metadata/md5-cache/net-vpn/tailscale-0.98_p0
index 9fd47b8fd958..25f561481b03 100644
--- a/metadata/md5-cache/net-vpn/tailscale-0.98_p0
+++ b/metadata/md5-cache/net-vpn/tailscale-0.98_p0
@@ -9,4 +9,4 @@ RDEPEND=net-firewall/iptables virtual/tmpfiles
 SLOT=0
 SRC_URI=amd64? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_amd64.tgz ) arm? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_arm.tgz ) arm64? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_arm64.tgz ) x86? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_386.tgz )
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b4ae4129b3945fedd06b3b9f87acada
+_md5_=f383a42f538ddf4038f19fb6258d1201
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200510 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
similarity index 96%
rename from metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200510
rename to metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
index 3ee435bc0185..996f94255777 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200510
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
 SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200510.tar.xz
+SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200513.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=aa9f1f91ac78d697f19de24f1857e31d
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 2f937b5a37b6..ce4cce69b86f 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/unifi-5.12.35 b/metadata/md5-cache/net-wireless/unifi-5.12.35
deleted file mode 100644
index 9a90daadee46..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.12.35
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-IUSE=systemd
-KEYWORDS=amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.12
-SRC_URI=https://dl.ui.com/unifi/5.12.35/UniFi.unix.zip -> unifi-5.12.35.zip
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=39c8aba42108a7832703a314ef4ce75d
diff --git a/metadata/md5-cache/net-wireless/unifi-5.12.66 b/metadata/md5-cache/net-wireless/unifi-5.12.66
deleted file mode 100644
index 1fe9a4c9244a..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.12.66
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=6
-HOMEPAGE=https://www.ubnt.com
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.12
-SRC_URI=https://dl.ui.com/unifi/5.12.66-2a7dc90946/UniFi.unix.zip -> unifi-5.12.66.zip
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0397606538b26848dc17509d47e5f650
diff --git a/metadata/md5-cache/net-wireless/unifi-5.12.72 b/metadata/md5-cache/net-wireless/unifi-5.12.72
index f2efad35db24..0004740cf116 100644
--- a/metadata/md5-cache/net-wireless/unifi-5.12.72
+++ b/metadata/md5-cache/net-wireless/unifi-5.12.72
@@ -4,11 +4,11 @@ DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
 EAPI=6
 HOMEPAGE=https://www.ubnt.com
 IUSE=systemd
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/5.12
-SRC_URI=https://dl.ui.com/unifi/5.12.72-0bbca4291e/UniFi.unix.zip -> unifi-5.12.72.zip
+SRC_URI=https://dl.ui.com/unifi/5.12.72/UniFi.unix.zip -> unifi-5.12.72.zip
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d49f51820a41d0877705c2f94db8889c
+_md5_=2eabfcf26b8bff973a503bb354ab5bc7
diff --git a/metadata/md5-cache/net-wireless/unifi-5.13.18 b/metadata/md5-cache/net-wireless/unifi-5.13.26
similarity index 81%
rename from metadata/md5-cache/net-wireless/unifi-5.13.18
rename to metadata/md5-cache/net-wireless/unifi-5.13.26
index f9e070330175..8cde86dcb86a 100644
--- a/metadata/md5-cache/net-wireless/unifi-5.13.18
+++ b/metadata/md5-cache/net-wireless/unifi-5.13.26
@@ -9,6 +9,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/5.13
-SRC_URI=https://dl.ui.com/unifi/5.13.18-b0197fba32/UniFi.unix.zip -> unifi-5.13.18.zip
+SRC_URI=https://dl.ui.com/unifi/5.13.26-601d3b699e/UniFi.unix.zip -> unifi-5.13.26.zip
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2de6264c87859cc61d9c07cd378d4b21
+_md5_=407b694e680e0e90d54d96ace81cb150
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 9a85be79869a..10402e637e7c 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/foldingathome-7.6.9 b/metadata/md5-cache/sci-biology/foldingathome-7.6.13
similarity index 91%
rename from metadata/md5-cache/sci-biology/foldingathome-7.6.9
rename to metadata/md5-cache/sci-biology/foldingathome-7.6.13
index 33852969643f..ea7aa52d9bf2 100644
--- a/metadata/md5-cache/sci-biology/foldingathome-7.6.9
+++ b/metadata/md5-cache/sci-biology/foldingathome-7.6.13
@@ -9,6 +9,6 @@ LICENSE=FAH-EULA-2014 FAH-special-permission
 RDEPEND=app-arch/bzip2 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:* ) sys-devel/gcc sys-libs/glibc sys-libs/zlib acct-group/video
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient_7.6.9-64bit-release.tar.bz2
+SRC_URI=https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient_7.6.13-64bit-release.tar.bz2
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=35efc85acab21d56c5bb97f30da7e0f8
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index f5e492c0229c..8b0891c4d7b9 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/gromacs-2018.8 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
index aee41b8ec9dc..c80b77023817 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
@@ -1,5 +1,5 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare pretend test
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
@@ -10,6 +10,6 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 RESTRICT=!test? ( test )
 SLOT=0/2018.8
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.8.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018.8.tar.gz )
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.8.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2018.8.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2018.8.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28fc707e93a55a7d80a49f6b24baa301
+_md5_=a32ab5161d3eb1ff03ec5abd8b254ffb
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
deleted file mode 100644
index 47cc9937137a..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-RESTRICT=!test? ( test )
-SLOT=0/2018.9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e109e4f17d20232ba21c7fd1ded8cc4
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
index 35e3a8d6e953..42abe22d6b76 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare pretend test
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_single_target_python2_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 RESTRICT=!test? ( test )
 SLOT=0/2019.5
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019.5.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb6b16f5dce43e3eb029b767e41aa242
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.5.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2019.5.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2019.5.tar.gz )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e595c9a2b8ef5e99d8c7624d40fbeee7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
index f34c06211600..0fecebd9122e 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare pretend test
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_single_target_python2_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
 RESTRICT=!test? ( test )
 SLOT=0/2019.6
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.6.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019.6.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae608551e7776c6a014686d95e8a4a5d
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.6.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2019.6.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2019.6.tar.gz )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26f84d9e5c8e050b54eea7b741e8497e
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2019.9999
deleted file mode 100644
index a33ce36e3c99..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_single_target_python2_7
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0/2019.9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=074cc86cc9733be5cadd37bc659b3ffe
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index d0501b0e6df3..be924e0451d2 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-5.0.1
deleted file mode 100644
index 6128d2c1fe46..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=6
-HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ?? ( occ oce )
-SLOT=0
-SRC_URI=https://launchpad.net/kicad/5.0/5.0.1/+download/kicad-5.0.1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8b60447c3addeb9739abb4fc05aea47
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
index 65b02787f4e5..b59229cb14fc 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
 IUSE=doc examples github +ngspice occ +oce openmp +python +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.0/+download/kicad-5.1.0.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4d4e25fc50e2a3679afc1fb3897e1a8
+_md5_=51401aa6aff721b410fa509e1971baa6
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
index 98e22fe14969..04d442fd0cff 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
 IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.2/+download/kicad-5.1.2.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06bf269b27d80c6381248d2a1af1e567
+_md5_=4fb8880db0d1554ba680de36f1551389
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.4 b/metadata/md5-cache/sci-electronics/kicad-5.1.4
index 7eeaf3efa278..d6761c2a4f6d 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.4
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
 IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.4/+download/kicad-5.1.4.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=262c232b84917afd8546542e94b9bb8a
+_md5_=94871ca17d5950ddabf5577f224f0fe2
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
similarity index 52%
rename from metadata/md5-cache/sci-electronics/kicad-5.1.5-r1
rename to metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
index 8fb229bde94d..e18427d48261 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( >=dev-lang/swig-3.0:0 )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=7
 HOMEPAGE=https://www.kicad-pcb.org
 IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sci-electronics/electronics-menu
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.5/+download/kicad-5.1.5.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2fe4251efe2f31b43de5913581f61b3
+_md5_=99ace06e9333579d254742330e8510bf
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1
deleted file mode 100644
index 818674196295..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
-EAPI=6
-HOMEPAGE=https://kicad.github.io/footprints/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.0.0
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-footprints/archive/5.0.1.tar.gz -> kicad-footprints-5.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f76beb5884fd329299ab9769cf3222d
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
deleted file mode 100644
index f772081b9816..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools GUI translations.
-EAPI=6
-HOMEPAGE=https://github.com/KiCad/kicad-i18n
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.0.0
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-i18n/archive/5.0.1.tar.gz -> kicad-i18n-5.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5507c1057cbc71347ca68ea1b4d5c1b2
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1
deleted file mode 100644
index 4210c23c9fe4..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
-EAPI=7
-HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc nls
-KEYWORDS=~amd64
-LICENSE=metapackage
-RDEPEND=>=sci-electronics/kicad-5.0.1 >=sci-electronics/kicad-symbols-5.0.1 >=sci-electronics/kicad-footprints-5.0.1 >=sci-electronics/kicad-packages3d-5.0.1 >=sci-electronics/kicad-templates-5.0.1 doc? ( >=app-doc/kicad-doc-5.0.1 ) nls? ( >=sci-electronics/kicad-i18n-5.0.1 )
-SLOT=0
-_md5_=53bb9e1d5f60869664c3d58dbae0d7ac
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
deleted file mode 100644
index 1041848a07eb..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
-EAPI=6
-HOMEPAGE=https://kicad.github.io/packages3d/
-IUSE=occ +oce
-KEYWORDS=~amd64
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.0.0[occ=,oce=]
-REQUIRED_USE=|| ( occ oce )
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.0.1.tar.gz -> kicad-packages3d-5.0.1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9609c042f42c414548b1360003c34145
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1
deleted file mode 100644
index dcdc99edb95c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
-EAPI=6
-HOMEPAGE=https://kicad.github.io/symbols/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.0.0
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-symbols/archive/5.0.1.tar.gz -> kicad-symbols-5.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bdd4d04c970bcae7606e4038beaa5d00
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1
deleted file mode 100644
index ba29d03977cc..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Electronic Schematic and PCB design tools project templates
-EAPI=6
-HOMEPAGE=https://github.com/kicad/kicad-templates
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.0.0
-SLOT=0
-SRC_URI=https://github.com/KiCad/kicad-templates/archive/5.0.1.tar.gz -> kicad-templates-5.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ad7db85c5aa6a163d7c53cb49708263
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index ebdadedc3833..99dfed85597b 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1
deleted file mode 100644
index e616d192e527..000000000000
--- a/metadata/md5-cache/sci-mathematics/pymc3-3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( <=dev-python/commonmark-0.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pandas-0.18[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/patsy-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/theano-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tqdm-4.8.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose-parameterized[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Bayesian Modeling and Probabilistic Machine Learning in Python
-EAPI=6
-HOMEPAGE=http://pymc-devs.github.io/pymc3/
-IUSE=test python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=AFL-3.0
-RDEPEND=<=dev-python/commonmark-0.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pandas-0.18[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/patsy-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/theano-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tqdm-4.8.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pymc3/pymc3-3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa05c7d863190f31f44618a9f9c32a8f
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1-r1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1-r1
new file mode 100644
index 000000000000..34a4334ea1d6
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/pymc3-3.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/joblib-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pandas-0.18[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/patsy-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/theano-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tqdm-4.8.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose-parameterized[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Bayesian Modeling and Probabilistic Machine Learning in Python
+EAPI=6
+HOMEPAGE=http://pymc-devs.github.io/pymc3/
+IUSE=test python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AFL-3.0
+RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pandas-0.18[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/patsy-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/theano-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tqdm-4.8.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymc3/pymc3-3.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2243372729cec5787001c08b72a94c7
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.8 b/metadata/md5-cache/sci-mathematics/z3-4.8.8
new file mode 100644
index 000000000000..ad34e776937f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.8
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
+DESCRIPTION=An efficient theorem prover
+EAPI=7
+HOMEPAGE=https://github.com/Z3Prover/z3/
+IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0/4.8
+SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.8.tar.gz
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b751c61421630f6d3ac35f1aa4fd634
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9cf6da1fd2d3..15e9fd7c7651 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/moreutils-0.63 b/metadata/md5-cache/sys-apps/moreutils-0.63
index 2860d71e3d4c..e061eebbc569 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.63
+++ b/metadata/md5-cache/sys-apps/moreutils-0.63
@@ -4,10 +4,10 @@ DESCRIPTION=a collection of tools that nobody thought to write when Unix was you
 EAPI=7
 HOMEPAGE=https://joeyh.name/code/moreutils/
 IUSE=+doc +perl
-KEYWORDS=~alpha amd64 ~arm64 hppa ~ppc ~ppc64 x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm64 hppa ~ppc ~ppc64 x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/moreutils/moreutils_0.63.orig.tar.xz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ebcf4ab52f890f68b6211ffa8f6decb2
+_md5_=abfc8997724248bc7cacf790e2971120
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index b2241cfbb8db..b4e901d43d72 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/keystone-16.0.1 b/metadata/md5-cache/sys-auth/keystone-16.0.1
new file mode 100644
index 000000000000..5b7f4f003f6e
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/keystone-16.0.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=The Openstack authentication, authorization, and service catalog
+EAPI=7
+HOMEPAGE=https://launchpad.net/keystone
+IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-7.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.44.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) acct-user/keystone acct-group/keystone python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-16.0.1 https://tarballs.openstack.org/keystone/keystone-16.0.1.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c67e9048225cbf9fe9639ef288354546
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index fce4eda6c0b8..c8ce4e57ad71 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.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12
new file mode 100644
index 000000000000..3b04e5d5f071
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12
@@ -0,0 +1,13 @@
+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-controller-manager-1.15.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12
new file mode 100644
index 000000000000..a9974b7d054d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12
@@ -0,0 +1,13 @@
+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-proxy-1.15.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.12
new file mode 100644
index 000000000000..38de3a78efa5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.12
@@ -0,0 +1,13 @@
+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-scheduler-1.15.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12
new file mode 100644
index 000000000000..f71c78530d4f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12
@@ -0,0 +1,13 @@
+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/kubeadm-1.15.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.12
new file mode 100644
index 000000000000..85a821cb43a2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.15.12
@@ -0,0 +1,13 @@
+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	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a71834838a6bb2722d96094d0485d9e6
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.15.12 b/metadata/md5-cache/sys-cluster/kubectl-1.15.12
new file mode 100644
index 000000000000..5d4bbeceb90e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.15.12
@@ -0,0 +1,12 @@
+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	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e2a4fdb1b0067f2ff01e8d3e0d774f28
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.12 b/metadata/md5-cache/sys-cluster/kubelet-1.15.12
new file mode 100644
index 000000000000..5a408550b3e9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.15.12
@@ -0,0 +1,13 @@
+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	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6febf1e2da4a85d3fb69267e2c4ca013
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.10.1 b/metadata/md5-cache/sys-cluster/minikube-1.10.1
new file mode 100644
index 000000000000..89443dfdd0ff
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/minikube-1.10.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-bindata >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
+DESCRIPTION=Single Node Kubernetes Cluster
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+IUSE=hardened libvirt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
+RDEPEND=>=sys-cluster/kubernetes-1.17.3[kubectl] libvirt? ( app-emulation/libvirt:=[qemu] )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/minikube/archive/v1.10.1.tar.gz -> minikube-1.10.1.tar.gz mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v35.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v38.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv38.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.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.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20190822182118-27a4ced34534.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20190822182118-27a4ced34534.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.0.0-20190417211021-672e52e9209d.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.zip -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/!parallels/docker-machine-parallels/@v/v1.3.0.mod -> github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/!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/!vivid!cortex/ewma/@v/v1.1.1.zip -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!vivid!cortex/ewma/@v/v1.1.1.mod -> github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20190910175809-eb9f6c26742c.zip -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.zip mirror://goproxy//github.com/afbjorklund/go-getter/@v/v1.4.1-0.20190910175809-eb9f6c26742c.mod -> github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 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/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/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/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/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/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.16.26.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.1.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.18.2.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.18.2.mod mirror://goproxy//github.com/bazelbuild/bazel-gazelle/@v/v0.19.1-0.20191105222053-70208cbdc798.mod -> github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.19.1-0.20191105222053-70208cbdc798.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190731111112-f720930ceb60.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190731111112-f720930ceb60.mod mirror://goproxy//github.com/bazelbuild/buildtools/@v/v0.0.0-20190917191645-69366ca98f89.mod -> github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190917191645-69366ca98f89.mod mirror://goproxy//github.com/bazelbuild/rules_go/@v/v0.0.0-20190719190356-6dae44dc5cab.mod -> github.com%2Fbazelbuild%2Frules_go%2F@v%2Fv0.0.0-20190719190356-6dae44dc5cab.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/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/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/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.zip -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip mirror://goproxy//github.com/c4milo/gotoolkit/@v/v0.0.0-20170318115440-bcc06269efa9.mod -> github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/prettybench/@v/v0.0.0-20150116022406-03b8cfe5406c.mod -> github.com%2Fcespare%2Fprettybench%2F@v%2Fv0.0.0-20150116022406-03b8cfe5406c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/@v/v0.0.0-20190109184317-bdb7599cd87b.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20190109184317-bdb7599cd87b.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/@v/v0.0.0-20190109184317-bdb7599cd87b.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20190109184317-bdb7599cd87b.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.zip -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/cheggaaa/pb/v3/@v/v3.0.1.mod -> github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry-attic/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.zip -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip mirror://goproxy//github.com/cloudfoundry/jibber_jabber/@v/v0.0.0-20151120183258-bcc4c8345a21.mod -> github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20170925154832-84eeaae905fa.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190228175220-2a93cfde8c20.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.4.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.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.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20200303162255-7d407207c304.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20190924003213-a8608b5b67c7.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libnetwork/@v/v0.8.0-dev.2.0.20190624125649-f0e46a78ea34.mod -> github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20190624125649-f0e46a78ea34.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.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/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.zip -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip mirror://goproxy//github.com/elazarl/goproxy/ext/@v/v0.0.0-20190421051319-9d40249d3c2f.mod -> github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/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/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-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-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20181101234600-2ff6f7ffd60f.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20181101234600-2ff6f7ffd60f.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 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-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.zip -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip mirror://goproxy//github.com/golang-collections/collections/@v/v0.0.0-20130729185459-604e922904d3.mod -> github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/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.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.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/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.18.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.18.0.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.35.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.35.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.2-0.20191028172631-481baca67f93.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.2-0.20191028172631-481baca67f93.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20200131185320-aec8da010de2.zip -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200131185320-aec8da010de2.zip mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20200131185320-aec8da010de2.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200131185320-aec8da010de2.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/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.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 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.2.2.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.zip -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip mirror://goproxy//github.com/hooklift/assert/@v/v0.0.0-20170704181755-9d1defd6d214.mod -> github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.zip -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip mirror://goproxy//github.com/hooklift/iso9660/@v/v0.0.0-20170318115843-1cf07e5970d8.mod -> github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip 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.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.zip -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip mirror://goproxy//github.com/intel-go/cpuid/@v/v0.0.0-20181003105527-1a4a6f06a1c6.mod -> github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.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/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.zip -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip mirror://goproxy//github.com/johanneswuerbach/nfsexports/@v/v0.0.0-20200318065542-c48c3734757f.mod -> github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.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/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.zip -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip mirror://goproxy//github.com/juju/clock/@v/v0.0.0-20190205081909-9c5c9712527c.mod -> github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.zip -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip mirror://goproxy//github.com/juju/errors/@v/v0.0.0-20190806202954-0232dcc7464d.mod -> github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.zip -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip mirror://goproxy//github.com/juju/loggo/@v/v0.0.0-20190526231331-6e530bcce5d8.mod -> github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.zip -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip mirror://goproxy//github.com/juju/mutex/@v/v0.0.0-20180619145857-d21b13acf4bf.mod -> github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.zip -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip mirror://goproxy//github.com/juju/retry/@v/v0.0.0-20180821225755-9058e192b216.mod -> github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.zip -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip mirror://goproxy//github.com/juju/testing/@v/v0.0.0-20190723135506-ce30eb24acd2.mod -> github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.zip -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip mirror://goproxy//github.com/juju/utils/@v/v0.0.0-20180820210520-bf9cc5bdd62d.mod -> github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.zip -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip mirror://goproxy//github.com/juju/version/@v/v0.0.0-20180108022336-b64dbd566305.mod -> github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.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/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.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.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/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/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.zip -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.zip mirror://goproxy//github.com/libvirt/libvirt-go/@v/v3.4.0+incompatible.mod -> github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.zip -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/machine-drivers/docker-machine-driver-vmware/@v/v0.1.1.mod -> github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200323212942-41eb826190d8.zip -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200323212942-41eb826190d8.zip mirror://goproxy//github.com/machine-drivers/machine/@v/v0.7.1-0.20200323212942-41eb826190d8.mod -> github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200323212942-41eb826190d8.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.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/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mesos/mesos-go/@v/v0.0.9.mod -> github.com%2Fmesos%2Fmesos-go%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.1+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.zip -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.zip mirror://goproxy//github.com/moby/hyperkit/@v/v0.0.0-20171020124204-a12cd7250bcd.mod -> github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.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/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v0.0.0-20170113033406-39771216ff4c.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.zip mirror://goproxy//github.com/morikuni/aec/@v/v0.0.0-20170113033406-39771216ff4c.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 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/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.3.1-0.20190929122143-5215b1806f52.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.0.2.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20160118053552-9302be274faa.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.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/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.zip -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip mirror://goproxy//github.com/pkg/profile/@v/v0.0.0-20161223203901-3a8809bd8a80.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.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/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/pquerna/ffjson/@v/v0.0.0-20180717144149-af8b230fcd20.mod -> github.com%2Fpquerna%2Fffjson%2F@v%2Fv0.0.0-20180717144149-af8b230fcd20.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_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-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.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.6.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.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.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.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/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-charset/@v/v0.0.0-20180617210344-2471d30d28b4.mod -> github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20160810183302-0bfd3b39853c.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20160810183302-0bfd3b39853c.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.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/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sayboras/dockerclient/@v/v0.0.0-20191231050035-015626177a97.zip -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv0.0.0-20191231050035-015626177a97.zip mirror://goproxy//github.com/sayboras/dockerclient/@v/v0.0.0-20191231050035-015626177a97.mod -> github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv0.0.0-20191231050035-015626177a97.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.18.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/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/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/sirupsen/logrus/@v/v1.0.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.6.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.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/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.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/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.5.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.2.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/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/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vdemeester/k8s-pkg-credentialprovider/@v/v0.0.0-20200107171650-7c61ffa44238.mod -> github.com%2Fvdemeester%2Fk8s-pkg-credentialprovider%2F@v%2Fv0.0.0-20200107171650-7c61ffa44238.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20171111001504-be1fbeda1936.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.zip -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip mirror://goproxy//github.com/zchee/go-vmnet/@v/v0.0.0-20161021174912-97ebf9174097.mod -> github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//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-20190927031335-2835ba2e683f.zip -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190927031335-2835ba2e683f.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180426230345-b49d69b5da94.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180426230345-b49d69b5da94.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.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-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190424203555-c05e17bb3b2d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181102091132-c10e9556a7bc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181102091132-c10e9556a7bc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190502183928-7f726cade0ab.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.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/net/@v/v0.0.0-20200301022130-244492dfa37a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190122071731-054c452bb702.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190122071731-054c452bb702.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.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-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/text/@v/v0.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.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip 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-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190122202912-9c309ee22fab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190122202912-9c309ee22fab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190909030654-5b82db07426d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200115165105-de0b1760071a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200115165105-de0b1760071a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200115165105-de0b1760071a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200115165105-de0b1760071a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.1-0.20190607001116-5213b8090861.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.1-0.20190607001116-5213b8090861.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/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.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/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.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//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.1.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.3.5.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.3.5.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.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-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.2.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//k8s.io/api/@v/v0.17.3.zip -> k8s.io%2Fapi%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/api/@v/v0.17.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.17.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/apiserver/@v/v0.17.3.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.17.3.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.3.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/client-go/@v/v0.17.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.17.3.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.zip -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.17.3.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.3.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.3.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/component-base/@v/v0.17.3.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.17.3.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.17.3.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.17.3.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.zip -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kube-proxy/@v/v0.17.3.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.17.3.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubectl/@v/v0.17.3.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.zip -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/kubelet/@v/v0.17.3.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.17.3.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.17.3.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.17.3.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.17.3.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.17.3.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/metrics/@v/v0.17.3.zip -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.zip mirror://goproxy//k8s.io/metrics/@v/v0.17.3.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/repo-infra/@v/v0.0.1-alpha.1.mod -> k8s.io%2Frepo-infra%2F@v%2Fv0.0.1-alpha.1.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.17.3.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/system-validators/@v/v1.0.4.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.0.4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.zip 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-20200229041039-0a110f9eb7ab.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200229041039-0a110f9eb7ab.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200229041039-0a110f9eb7ab.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200229041039-0a110f9eb7ab.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.zip -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//sigs.k8s.io/sig-storage-lib-external-provisioner/@v/v4.0.0+incompatible.mod -> sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod
+_eclasses_=go-module	cca12a5688562f107c14ffcf28195dd7
+_md5_=953852609a4f5448f0e95cf35f3ff1fe
diff --git a/metadata/md5-cache/sys-cluster/slurm-19.05.4.1 b/metadata/md5-cache/sys-cluster/slurm-19.05.4.1
deleted file mode 100644
index fcbe181227bc..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-19.05.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 ) ) 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=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-19-05-4-1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27907f306db93a5fd4ab2df01bd78aa6
diff --git a/metadata/md5-cache/sys-cluster/slurm-19.05.5.1 b/metadata/md5-cache/sys-cluster/slurm-19.05.5.1
deleted file mode 100644
index 4122f05279f0..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-19.05.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 ) ) 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=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-19-05-5-1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=81d9cadc7817f1cd4d6a74bfa1e9b619
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.02.1.1 b/metadata/md5-cache/sys-cluster/slurm-20.02.1.1
deleted file mode 100644
index 8f6acea2249a..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-20.02.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 ) ) 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=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-1-1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e38abc584246fe99bb046a6ed9511610
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.02.0.1 b/metadata/md5-cache/sys-cluster/slurm-20.02.2.1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/slurm-20.02.0.1
rename to metadata/md5-cache/sys-cluster/slurm-20.02.2.1
index 59ea24f72148..b9f19bd4c52c 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.02.0.1
+++ b/metadata/md5-cache/sys-cluster/slurm-20.02.2.1
@@ -11,6 +11,6 @@ RDEPEND=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-0-1.tar.gz
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-02-2-1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e38abc584246fe99bb046a6ed9511610
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4f1532acf9ee..ead8b4214de1 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/bmake-20181221 b/metadata/md5-cache/sys-devel/bmake-20200318
similarity index 81%
rename from metadata/md5-cache/sys-devel/bmake-20181221
rename to metadata/md5-cache/sys-devel/bmake-20200318
index f9b6dd23058e..1605258533c6 100644
--- a/metadata/md5-cache/sys-devel/bmake-20181221
+++ b/metadata/md5-cache/sys-devel/bmake-20200318
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20181221.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20191111.tar.gz
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20200318.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20191111.tar.gz
 _md5_=3bb83078a0dc14c05c364130fba4a2a9
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d1388c862e1c..a6dd8a0f2d56 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/cryptsetup-2.3.2 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
index 97446981a506..2455ae615b9c 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=gcrypt kernel nettle +openssl +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b789fe4a638ae1d128d68de052f260ce
+_md5_=f07764efb9901965f444b51b7f84c6de
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.3 b/metadata/md5-cache/sys-fs/lxcfs-4.0.3
new file mode 100644
index 000000000000..afbddaf2f1e1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/help2man >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/glib:2 sys-fs/fuse:0
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-4.0.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bef0c9b185ab468090988dbfc83b3905
diff --git a/metadata/md5-cache/sys-fs/treesize-0.54.1-r1 b/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
index 925b560b0976..adef81b1cab3 100644
--- a/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
+++ b/metadata/md5-cache/sys-fs/treesize-0.54.1-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/treesize/treesize-0.54.1-src.tbz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a2654512556744055f05d1e15c153739
+_md5_=a8f8dd1c14540f922701e7b36e4d72c1
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
index cdb797c33713..36e032d96eb6 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
@@ -12,4 +12,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34c46307576e1276a3a56c48d360eb7d
+_md5_=f590abfc664547bcff3feaff3697dcb6
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 3f2cc44c3961..7be2b40d71fc 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -11,4 +11,4 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34c46307576e1276a3a56c48d360eb7d
+_md5_=f590abfc664547bcff3feaff3697dcb6
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 7663ecb8813f..e467850274b6 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
new file mode 100644
index 000000000000..fbf3fe1cfeef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.123
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-122.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-122.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-122.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-122.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-122.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=93d873b6ee4d68feb2de7583475ad614
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
new file mode 100644
index 000000000000..93265df18f83
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.4.41
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-41.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-41.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-41.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-41.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-41.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=397a7fdb0ca588736735c6ab488ed2f8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
new file mode 100644
index 000000000000..958148eb1f61
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.6 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.6.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.6-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.6-17.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3dc31952751e35985040d00f29611058
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
new file mode 100644
index 000000000000..23968a0e6607
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.6_p7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf7.diff -> pf-sources-5.6_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	51166f4011c40ba947ae50ae7184139f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3ed93f68a5fffbbbc004eb227958e8c4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
index 603f0c8dba5e..70d49b18db9c 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.170_p75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.170.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.170-rt75.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.170-rt75.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52
index 0f3a6f0f3ec2..ae7cda6771a4 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.120_p52
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.120.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.120-rt52.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.120-rt52.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38
index 17d6c24ce521..8e209a799fac 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.94_p38
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.94.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.94-rt38.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.94-rt38.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a8d1019203a7792b6e8327c04db3b92a
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192
index b7163ddf85b9..8299979576a4 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.215_p192
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.215.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.215-rt192.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.215-rt192.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196
index 1d7a2d0a4bfd..a3af8625c128 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.220_p196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.220.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.220-rt196.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.220-rt196.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138
index 39b2a6b3511b..37f9a07ad361 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.215_p138
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.215.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.215-rt138.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.215-rt138.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143
index c8e38bf424d0..7595a9c74ff4 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2 !deblob? ( linux-firmware )
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.220_p143
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.220.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.220-rt143.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.220-rt143.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc46ae5b4c792a870badf6cf77a1f606
+_md5_=d2bf5c9e08951c9f1d8bfe2cac08f196
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7
index e34a3f13b931..8d6a6e5b5b3f 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=5.4.13_p7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.13-rt7.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.13-rt7.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27106b82c432dcf8f4d8955afd05aaad
+_md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21
index 08740ca93fa5..4fb6d6e64bb9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 5.4 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=5.4.34_p21
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.34.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.34-rt21.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.34-rt21.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27106b82c432dcf8f4d8955afd05aaad
+_md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5
index 2748cd239e04..c6129fdbba33 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 5.6 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=5.6.10_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.10.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.10-rt5.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.10-rt5.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27106b82c432dcf8f4d8955afd05aaad
+_md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3 b/metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3
index 40a593458a62..1353122698fe 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3
@@ -4,11 +4,11 @@ DESCRIPTION=Full Linux 5.6 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://www.kernel.org/pub/linux/kernel/projects/rt/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
 IUSE=symlink build deblob
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=5.6.4_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-5.6 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.6-gnu/deblob-check -> deblob-check-5.6 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/patch-5.6.4-rt3.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.4-rt3.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27106b82c432dcf8f4d8955afd05aaad
+_md5_=2524629bd8b115fb50d4edeee9c7bf5c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.122 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.123
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.122
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.123
index b6eeaaaf07c8..afb127145e4e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.122
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.123
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.19.122
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.122.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.123
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.123.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.40 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.41
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.40
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.41
index b66a54dffeeb..acc31c93633c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.41
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.4.40
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.40.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.41
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.41.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.13
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.6.12
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.6.13
index 4b53315948bf..582848b49db0 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.6.13
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.6.12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
+SLOT=5.6.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.6.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	51166f4011c40ba947ae50ae7184139f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 8cef2d8444e7..1280ed51a447 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/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 85d03401c80b..8d22fb7d1133 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-16.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9941408eb1e531db8112a2147eebe2d6
+_md5_=0cba579d8066f47ff6ea33eacc1d24e9
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.10 b/metadata/md5-cache/sys-libs/ldb-2.0.10
index f153189bf417..9d765cb455c8 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.0.10
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.10
@@ -4,7 +4,7 @@ DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc +ldap +lmdb python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) test? ( python )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0.10
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.10.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	2d2617a730e75e491e1d17af87841ec5	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=7e148c512c8ad73f8222522d36cf7100
+_md5_=a4e74ce545fdc8a44116b3dbfab8eab2
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 81f1eca98291..d8a4853b75a7 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/opencl-3-r1 b/metadata/md5-cache/virtual/opencl-3-r1
index a29af0a5d807..5c6a2a1ef008 100644
--- a/metadata/md5-cache/virtual/opencl-3-r1
+++ b/metadata/md5-cache/virtual/opencl-3-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Virtual for OpenCL API
 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 ~x86
+KEYWORDS=amd64 x86
 RDEPEND=|| ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/opencl-icd-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3879c83cccb36c0e8aa667dbc49efc70
+_md5_=c8d1895edcf8ca05b577f1292e2e78a1
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index edb2e1942119..2a45064d7def 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.9 b/metadata/md5-cache/www-apache/mod_h2-1.15.9
new file mode 100644
index 000000000000..bad627f25a58
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/archive/v1.15.9.tar.gz -> mod_h2-1.15.9.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aa19076ea90409c8366c7e5f87f72075
diff --git a/metadata/md5-cache/www-apache/mod_h2-9999 b/metadata/md5-cache/www-apache/mod_h2-9999
index 4ed52623cd8f..b80198f80f4c 100644
--- a/metadata/md5-cache/www-apache/mod_h2-9999
+++ b/metadata/md5-cache/www-apache/mod_h2-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	7d999b62b8749fad43fff00620cedf47	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d83bf078b99365887f6cfaed0ad86ca9
+_md5_=aa19076ea90409c8366c7e5f87f72075
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 13e9f3d69429..c460aa16caba 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-68.0.3618.104 b/metadata/md5-cache/www-client/opera-68.0.3618.104
index c27516e1dd76..7f87f7c70cb1 100644
--- a/metadata/md5-cache/www-client/opera-68.0.3618.104
+++ b/metadata/md5-cache/www-client/opera-68.0.3618.104
@@ -3,10 +3,10 @@ DESCRIPTION=A fast and secure web browser
 EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera/desktop/68.0.3618.104/linux/opera-stable_68.0.3618.104_amd64.deb https://download2.operacdn.com/pub/opera/desktop/68.0.3618.104/linux/opera-stable_68.0.3618.104_amd64.deb https://download3.operacdn.com/pub/opera/desktop/68.0.3618.104/linux/opera-stable_68.0.3618.104_amd64.deb https://download4.operacdn.com/pub/opera/desktop/68.0.3618.104/linux/opera-stable_68.0.3618.104_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=807ea2165349f373f6c075a66ed12235
+_md5_=706af59742ff5910e0221a1771d821c0
diff --git a/metadata/md5-cache/www-client/opera-68.0.3618.63-r1 b/metadata/md5-cache/www-client/opera-68.0.3618.63-r1
deleted file mode 100644
index 853746af7276..000000000000
--- a/metadata/md5-cache/www-client/opera-68.0.3618.63-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/68.0.3618.63/linux/opera-stable_68.0.3618.63_amd64.deb https://download2.operacdn.com/pub/opera/desktop/68.0.3618.63/linux/opera-stable_68.0.3618.63_amd64.deb https://download3.operacdn.com/pub/opera/desktop/68.0.3618.63/linux/opera-stable_68.0.3618.63_amd64.deb https://download4.operacdn.com/pub/opera/desktop/68.0.3618.63/linux/opera-stable_68.0.3618.63_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=706af59742ff5910e0221a1771d821c0
diff --git a/metadata/md5-cache/www-client/opera-beta-68.0.3618.45 b/metadata/md5-cache/www-client/opera-beta-68.0.3618.45
deleted file mode 100644
index 09419cb73ae4..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-68.0.3618.45
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/68.0.3618.45/linux/opera-beta_68.0.3618.45_amd64.deb https://download2.operacdn.com/pub/opera-beta/68.0.3618.45/linux/opera-beta_68.0.3618.45_amd64.deb https://download3.operacdn.com/pub/opera-beta/68.0.3618.45/linux/opera-beta_68.0.3618.45_amd64.deb https://download4.operacdn.com/pub/opera-beta/68.0.3618.45/linux/opera-beta_68.0.3618.45_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-68.0.3618.55 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.2
similarity index 81%
rename from metadata/md5-cache/www-client/opera-beta-68.0.3618.55
rename to metadata/md5-cache/www-client/opera-beta-69.0.3686.2
index e669e8d86435..fcd71727dcf8 100644
--- a/metadata/md5-cache/www-client/opera-beta-68.0.3618.55
+++ b/metadata/md5-cache/www-client/opera-beta-69.0.3686.2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/68.0.3618.55/linux/opera-beta_68.0.3618.55_amd64.deb https://download2.operacdn.com/pub/opera-beta/68.0.3618.55/linux/opera-beta_68.0.3618.55_amd64.deb https://download3.operacdn.com/pub/opera-beta/68.0.3618.55/linux/opera-beta_68.0.3618.55_amd64.deb https://download4.operacdn.com/pub/opera-beta/68.0.3618.55/linux/opera-beta_68.0.3618.55_amd64.deb )
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/69.0.3686.2/linux/opera-beta_69.0.3686.2_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.2/linux/opera-beta_69.0.3686.2_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.2/linux/opera-beta_69.0.3686.2_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.2/linux/opera-beta_69.0.3686.2_amd64.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-developer-69.0.3673.0 b/metadata/md5-cache/www-client/opera-developer-69.0.3673.0
deleted file mode 100644
index 56271e47d09f..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-69.0.3673.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/69.0.3673.0/linux/opera-developer_69.0.3673.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/69.0.3673.0/linux/opera-developer_69.0.3673.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/69.0.3673.0/linux/opera-developer_69.0.3673.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/69.0.3673.0/linux/opera-developer_69.0.3673.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-69.0.3679.0 b/metadata/md5-cache/www-client/opera-developer-69.0.3679.0
deleted file mode 100644
index b5c613ab8be1..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-69.0.3679.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/69.0.3679.0/linux/opera-developer_69.0.3679.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/69.0.3679.0/linux/opera-developer_69.0.3679.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/69.0.3679.0/linux/opera-developer_69.0.3679.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/69.0.3679.0/linux/opera-developer_69.0.3679.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 5958a9c0858e..8e13ca0b269f 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/awstats-7.8 b/metadata/md5-cache/www-misc/awstats-7.8
index 9f3978338fa7..2f38c03209d9 100644
--- a/metadata/md5-cache/www-misc/awstats-7.8
+++ b/metadata/md5-cache/www-misc/awstats-7.8
@@ -3,10 +3,10 @@ DESCRIPTION=AWStats is short for Advanced Web Statistics
 EAPI=7
 HOMEPAGE=https://www.awstats.org/
 IUSE=geoip ipv6
-KEYWORDS=~alpha ~amd64 ~hppa ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ppc ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.6.1 dev-perl/URI virtual/perl-Time-Local geoip? ( dev-perl/Geo-IP ) ipv6? ( dev-perl/Net-DNS dev-perl/Net-IP )
 SLOT=0
 SRC_URI=https://www.awstats.org/files/awstats-7.8.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
-_md5_=ea3d208849e046c668279726803bd0b0
+_md5_=00906fb86d8727493827e6f9d805b3f6
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index fb1941b88071..c7379528424e 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.53 b/metadata/md5-cache/www-servers/tomcat-8.5.53
deleted file mode 100644
index 93a3a2be7ac9..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.53
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.53:3.1 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.53:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.53/src/apache-tomcat-8.5.53-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cc60b8f2f16705a99d91b8a487d1141b
diff --git a/metadata/md5-cache/www-servers/tornado-6.0.4 b/metadata/md5-cache/www-servers/tornado-6.0.4
index 5d07ca830e33..2edcd103fc75 100644
--- a/metadata/md5-cache/www-servers/tornado-6.0.4
+++ b/metadata/md5-cache/www-servers/tornado-6.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=Python web framework and asynchronous networking library
 EAPI=7
 HOMEPAGE=https://www.tornadoweb.org/
 IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pycurl-7.19.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/twisted-16.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-6.0.4.tar.gz
 _eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=96df0c110d8881409ae48a32e139447a
+_md5_=5d10100f503c094616e409996e6a4b83
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index e8aab5bfe559..05cf4282f03b 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.13 b/metadata/md5-cache/x11-base/xcb-proto-1.13
deleted file mode 100644
index 3c8b619e7663..000000000000
--- a/metadata/md5-cache/x11-base/xcb-proto-1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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=X C-language Bindings protocol headers
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 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=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
-_md5_=ad545cd0e5e8570c0c545c0bdb094b5e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3c8f536106df..fad4e62cab31 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/libva-2.7.1 b/metadata/md5-cache/x11-libs/libva-2.7.1
new file mode 100644
index 000000000000..a45225658ee8
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-2.7.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Video Acceleration (VA) API for Linux
+EAPI=7
+HOMEPAGE=https://01.org/linuxmedia/vaapi
+IUSE=+drm opengl utils vdpau wayland X video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
+RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
+SLOT=0/2
+SRC_URI=https://github.com/intel/libva/releases/download/2.7.1/libva-2.7.1.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9e77d147d273b9e7f858718e07c6c107
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13.1 b/metadata/md5-cache/x11-libs/libxcb-1.13.1
deleted file mode 100644
index 004267eedf77..000000000000
--- a/metadata/md5-cache/x11-libs/libxcb-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt || ( dev-lang/python:3.8[xml] dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) || ( ( dev-lang/python:3.8[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings library
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
-IUSE=doc selinux test xkb abi_x86_32 abi_x86_64 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/1.12
-SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
-_md5_=cd27f2130631df1270086f44981722fc
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6dd284a6e3f2..ea90e69ba7d6 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/synergy-2.0.0 b/metadata/md5-cache/x11-misc/synergy-2.0.0
index ee9ba814883f..694da28916c5 100644
--- a/metadata/md5-cache/x11-misc/synergy-2.0.0
+++ b/metadata/md5-cache/x11-misc/synergy-2.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple computers
 EAPI=6
-HOMEPAGE=http://synergy-project.org/ https://github.com/symless/synergy-core
+HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core
 IUSE=libressl
 KEYWORDS=~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/li
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v2.0.0-stable.tar.gz -> synergy-2.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aa1b23f81aa3b1c4707a261237f167d
+_md5_=7f3f2be1622851557bc1b127376417ab
diff --git a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1 b/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
index cef881cf76eb..5f6de27abb03 100644
--- a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
+++ b/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc ) x11-base/xorg-proto
 DESCRIPTION=A tool for recording Flash SWF movies from VNC sessions
 EAPI=7
-HOMEPAGE=http://www.unixuser.org/~euske/vnc2swf
+HOMEPAGE=https://www.unixuser.org/~euske/vnc2swf/
 IUSE=x11vnc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc )
 SLOT=0
-SRC_URI=http://www.unixuser.org/~euske/vnc2swf/vnc2swf-0.5.0.tar.gz
-_md5_=b2235365f6c18e3dec9ecffea52514d8
+SRC_URI=https://www.unixuser.org/~euske/vnc2swf/vnc2swf-0.5.0.tar.gz
+_md5_=cfa13efcf03aa4d39ea114a7255e0c4f
diff --git a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2 b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
index d644d0e1e7b9..3bfb3cd3bc14 100644
--- a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
+++ b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
 DESCRIPTION=A simple interactive calendar program with a notebook capability
 EAPI=6
-HOMEPAGE=http://www.freebsd.org/
+HOMEPAGE=https://www.freebsd.org/
 IUSE=motif
 KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=HPND
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/xcalendar-4.0+i18n.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c61472699f10ab403cef7d58d24f151b
+_md5_=934edd06f1d14d8759e28eb111a55346
diff --git a/metadata/md5-cache/x11-misc/xearth-1.1-r1 b/metadata/md5-cache/x11-misc/xearth-1.1-r1
index 04de9f440e14..9372fcb8da54 100644
--- a/metadata/md5-cache/x11-misc/xearth-1.1-r1
+++ b/metadata/md5-cache/x11-misc/xearth-1.1-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto x11-misc/imake app-text/rman
 DESCRIPTION=Xearth sets the X root window to an image of the Earth
 EAPI=5
-HOMEPAGE=http://hewgill.com/xearth/original/
+HOMEPAGE=https://hewgill.com/xearth/original/
 KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=xearth
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=ftp://cag.lcs.mit.edu/pub/tuna/xearth-1.1.tar.gz ftp://ftp.cs.colorado.edu/users/tuna/xearth-1.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b517a4bfa5b84bc048726f923fec37b
+_md5_=498ac1469c2fb2b9e09c437c2d307901
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 48ee2e36910a..1cacc10aa75e 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1 b/metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
index b7fd2c52973e..c5cd4be1b4ed 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install unpack
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 DESCRIPTION=Aurora GTK+ 2.x Theme Engine
 EAPI=7
-HOMEPAGE=http://www.gnome-look.org/content/show.php?content=56438
+HOMEPAGE=https://www.gnome-look.org/content/show.php?content=56438
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://gnome-look.org/CONTENT/content-files/56438-aurora-1.5.1.tar.bz2
-_md5_=e7fb0cd5e1552efbf5bac61222e98505
+SRC_URI=https://gnome-look.org/CONTENT/content-files/56438-aurora-1.5.1.tar.bz2
+_md5_=3d1204f7d520f59e61166fd5230aeb52
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3 b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
index 958dfd97c5a2..64eef1de8150 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+++ b/metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 DESCRIPTION=A derivative of the standard Clearlooks GTK+ 2.x engine with more orange feel
 EAPI=7
-HOMEPAGE=http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
+HOMEPAGE=https://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-12.diff.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c023891acec94f5f370e3777af6900f3
+_md5_=622cdef51387b8f1b0bd09bde2391816
diff --git a/metadata/md5-cache/x11-themes/human-icon-theme-0.36 b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
index 2fbd8f689618..0c09a660ef5d 100644
--- a/metadata/md5-cache/x11-themes/human-icon-theme-0.36
+++ b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile postinst postrm preinst prepare
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A nice and well polished icon theme
 EAPI=7
-HOMEPAGE=http://packages.ubuntu.com/lucid/human-icon-theme
+HOMEPAGE=https://packages.ubuntu.com/lucid/human-icon-theme
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-SA-2.5
 RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/tangerine-icon-theme )
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/h/human-icon-theme/human-icon-theme_0.36.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1374c80f1d03d5e435821940133090c2
+_md5_=215b0e44d3cddd27704353f3289bf257
diff --git a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27 b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
index 591185280208..fc4d62dd76eb 100644
--- a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
+++ b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile postinst postrm preinst prepare unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=a derivative of the standard Tango theme, using a more orange approach
 EAPI=7
-HOMEPAGE=http://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme
+HOMEPAGE=https://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme
 IUSE=minimal
 KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-2.5 LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/t/tangerine-icon-theme/tangerine-icon-theme_0.27.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e28ba0dad92ce5dd0f23f0d441b168b
+_md5_=4837658906ab41842037f44e0b1d6922
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 49f527401833..1acb25c86f7e 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/sawfish-1.12.0-r1 b/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
index 7397d43ec176..c884041ac874 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-lib
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd515d6a6d47526a4df4ca62e4c9bef7
+_md5_=1ad6d96940dcb42260fb0ba776a2add0
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.90 b/metadata/md5-cache/x11-wm/sawfish-1.12.90
new file mode 100644
index 000000000000..5332af90f83a
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) 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=Extensible window manager using a Lisp-based scripting language
+EAPI=6
+HOMEPAGE=https://sawfish.fandom.com/wiki/Main_Page
+IUSE=emacs kde nls xinerama
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 Artistic-2
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.90.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	504a3383c45504fde86b00426619a709	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95e9df92d1a31288ff2616cbb1d5954d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 17b051699116..04d94647d865 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 11671 BLAKE2B 1690ee8d13e213a22166c131af13ff1a0dfed95b26626717da1dd0e69d4ef665a541c29fb093b3448e8ead5892ef808f1ff49a831e1b340a550acc001b504b9b SHA512 f9c4594162a5063caf99f69d3ea6a9bd4aa9ba259aef4cbb27a28dc923f75da8b758a02237fa977fb867ea8cb8b599d4a1b25c6f88cf07541aa64d7ae03f5127
-TIMESTAMP 2020-05-13T19:38:22Z
+TIMESTAMP 2020-05-15T15:08:25Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl68TK5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6+sGlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYdA/+KNVlpJPFM69NyOlOrmCOQrGoSgq57z4I4ERAUBPyMLxkssLSD5M1NWvn
-TIGOTQmzzdrS/FrHWj2SGLS+19+r6HNvOxa4qWXDkBGHw0941qKoqhmCS3iys+Q3
-IlghJVplybWOHn2SfsTCycSoND8ByiVqWbDfMaLGz56WKdsDACUQ+hnOlmPOYxti
-xgfaY2sZJ4QAmnhDzcoVeXVWxJrLOlN2Io4g7srRXrBUac4fyQDIhr9+xLuAUHjd
-UT0nlpKTvBNMb8nCB3wgKECwvdGXbTIg0JhdnIdvDgzfToVE5QhWE38IvtIj4I1u
-UlSO/YO3dLbUpVvlysZptpitwcTUH4S61bm8Xsg7ZdMUrl/ZNcwDF0hNG8RoWKn2
-dqAzOkzPluaDLOk0ryP2e+fXoqyTml611Fo6Fvuo7QPksGcm2qVg7oM8ns/GvyxS
-n7ZLuJeBPtF8NNFoUNXNo3CxSUZ8MObJNfFGbxP7ClH7irgWLPXwhxk0kOhuQEZc
-7yNNKS0G3twzwh5uzdqlGMjZwrOGAHLGFotCSzwzU64hgbJWf8lQ5LClbwwqW9DF
-glvQEsZa0jfU/2GrZkQSo5xumlPMntjvyqmLrN1VObLSQYWzVS3JwOqLPn93GF4M
-QX+cCeZIZm/ZbG2SBW1Tfgzttc3bRn0dYSBo9bMR2/pPnMzie/0=
-=Ae8y
+klB6DQ//atVhUpxs3h6Xf+OdhKFiAMNwGnoz+WDBLty1uec51SCj2V0BW44TaoE1
+auXpO61yNiNT/2qJHZkpjPfip6y3MY+zMAIrxONq4DFC2ePGS4Cyey1BvmVdfg+8
+N1OPE2z6JAPVJnST4MnCN6G/Et1TZAQJjIxUeyAXnEPt2CP7SW5e0MzfwJMgtGjx
+TWxluex4wDATcy09a6QCH/MY04WDrjOaHfb6upzEhLp9NrWCqPn0V61DzQQQwKny
+zVYMTGVQ27N4PemHUb9+cFQxnM+Rqnk3wrfVns0G9zoS82+JuCUGb076zWrk9xXs
+3kiCZW8fQix80V8Q+BXgxWKAXVLtoudk5NeBwiFx4PlYFuoYDoGed7Ri+zN+ba7K
+x+nUEhaHu9kb5onkuTPct6sxfyAWC28Nb881EdPckBqbbELyB8Znl2TubwZBSVDh
+xCIwK3FWzV3Kxo4IUe/HzoBQSvBMl1igQAPBywrM52dV9g4qgs9lVD8V4cplcYBm
+HRjOZhkaGxgeruvCUJ9nvERPjSpZXHvD5fskqh1NJEAvJELqN0wM5g+73fNkikEZ
+zsIRFk57818/51JVd24+uaXDSCgS3GZ7E7GtRG+Sk94VmDF0iXUvAR/fbgzA+bcY
+QSr0keao/GraA4btgcHQYnCSW5MZjN39zDOvaif0k0roAo1N5vg=
+=6Xdd
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c2cfabb46057..8dcb011319b0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2020 19:38:19 +0000
+Fri, 15 May 2020 15:08:22 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index a09cdf651b61..35bcda644b12 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2079,6 +2079,10 @@
       <email>axs@gentoo.org</email>
       <name>Ian Stakenvicius</name>
     </member>
+    <member>
+      <email>juippis@gentoo.org</email>
+      <name>Joonas Niilola</name>
+    </member>
     <member>
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
@@ -3812,6 +3816,10 @@
       <email>dlan@gentoo.org</email>
       <name>Lan Yixun</name>
     </member>
+    <member>
+      <email>juippis@gentoo.org</email>
+      <name>Joonas Niilola</name>
+    </member>
     <member>
       <email>lu_zero@gentoo.org</email>
       <name>Luca Barbato</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index d28aff18290f..b636b3c1c09b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 13 May 2020 07:38:19 PM UTC
+Fri 15 May 2020 03:08:22 PM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 178e26a5fc96..699e66327f12 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -195,6 +195,7 @@
 2005090739 ./acct-group/bareos/bareos-0.ebuild
 2005111738 ./acct-group/spamd/spamd-0.ebuild
 2005122139 ./acct-group/buildbot/buildbot-0.ebuild
+2005141009 ./acct-group/lxd/lxd-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -427,6 +428,7 @@
 2002101639 ./app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
 2002051739 ./app-admin/ansible/ansible-9999.ebuild
 2005112009 ./app-admin/ansible/ansible-2.9.7.ebuild
+2005140039 ./app-admin/ansible/ansible-2.9.9.ebuild
 2004011239 ./app-admin/apache-tools/apache-tools-2.4.43.ebuild
 2004032241 ./app-admin/apache-tools/apache-tools-2.4.41.ebuild
 1802091238 ./app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -569,6 +571,7 @@
 1804260408 ./app-admin/go-updater/go-updater-0.2.0.ebuild
 1911221909 ./app-admin/gopass/gopass-1.8.6-r1.ebuild
 2005101739 ./app-admin/gopass/gopass-1.9.1.ebuild
+2005141439 ./app-admin/gopass/gopass-1.9.2.ebuild
 1702282250 ./app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
 1702282250 ./app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
 1810141939 ./app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -722,8 +725,9 @@
 1712101740 ./app-admin/sagan/sagan-0.2.3.ebuild
 1902080039 ./app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
 1712200109 ./app-admin/sagan/sagan-1.0.0_rc3.ebuild
-2005132239 ./app-admin/salt/salt-2019.2.4.ebuild
 2005132239 ./app-admin/salt/salt-3000.2-r4.ebuild
+2005140239 ./app-admin/salt/salt-2019.2.5.ebuild
+2005140239 ./app-admin/salt/salt-3000.3.ebuild
 1909180239 ./app-admin/serf/serf-0.8.1-r1.ebuild
 2001051415 ./app-admin/setools/setools-4.2.1.ebuild
 2002151639 ./app-admin/setools/setools-4.2.2.ebuild
@@ -754,9 +758,9 @@
 1908101909 ./app-admin/sxid/sxid-4.2-r2.ebuild
 2003261841 ./app-admin/sysklogd/sysklogd-2.0.3.ebuild
 2003261841 ./app-admin/sysklogd/sysklogd-2.1.1.ebuild
-2003261841 ./app-admin/sysklogd/sysklogd-2.1.2.ebuild
 2003261841 ./app-admin/sysklogd/sysklogd-9999.ebuild
 2004032241 ./app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+2005151509 ./app-admin/sysklogd/sysklogd-2.1.2.ebuild
 2003261841 ./app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
 2003261841 ./app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
 2003261841 ./app-admin/syslog-ng/syslog-ng-3.26.1.ebuild
@@ -777,6 +781,7 @@
 2001172309 ./app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
 1808181209 ./app-admin/tenshi/tenshi-0.17.ebuild
 2004271039 ./app-admin/terraform/terraform-0.12.24.ebuild
+2005141509 ./app-admin/terraform/terraform-0.12.25.ebuild
 1909082239 ./app-admin/testdisk/testdisk-7.1.ebuild
 1902251139 ./app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
 2004032241 ./app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
@@ -807,7 +812,7 @@
 2002112050 ./app-arch/afio/afio-2.5.1-r2.ebuild
 2002112050 ./app-arch/alien/alien-8.95-r1.ebuild
 2004041439 ./app-arch/alien/alien-8.95.ebuild
-2002112050 ./app-arch/arc/arc-5.21p.ebuild
+2005151109 ./app-arch/arc/arc-5.21p.ebuild
 1910111840 ./app-arch/arj/arj-3.10.22-r7.ebuild
 1909082140 ./app-arch/atool/atool-0.39.0-r1.ebuild
 2001051415 ./app-arch/bloscpack/bloscpack-0.16.0.ebuild
@@ -964,9 +969,9 @@
 1710271648 ./app-backup/backuppc/backuppc-3.3.1-r5.ebuild
 2002231739 ./app-backup/bacula/bacula-9.4.4-r2.ebuild
 2003252009 ./app-backup/bacula/bacula-9.6.3.ebuild
-1904161009 ./app-backup/bareos/bareos-18.2.6.ebuild
-2002231739 ./app-backup/bareos/bareos-17.2.6.ebuild
-2002231739 ./app-backup/bareos/bareos-17.2.7-r1.ebuild
+2005140739 ./app-backup/bareos/bareos-17.2.9.ebuild
+2005140739 ./app-backup/bareos/bareos-18.2.8.ebuild
+2005140739 ./app-backup/bareos/bareos-19.2.7.ebuild
 2001051415 ./app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
 2003291839 ./app-backup/borgbackup/borgbackup-9999.ebuild
 2004161709 ./app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
@@ -1133,6 +1138,7 @@
 1904222309 ./app-cdr/cdw/cdw-9999.ebuild
 2003261841 ./app-cdr/cue2toc/cue2toc-0.4.ebuild
 1702282250 ./app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
+2005151039 ./app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
 1712281509 ./app-cdr/cuegen/cuegen-1.2.0.ebuild
 1806071339 ./app-cdr/cuetools/cuetools-1.4.1.ebuild
 1712281509 ./app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
@@ -1982,7 +1988,7 @@
 2002031839 ./app-editors/scite/scite-4.2.1.ebuild
 2004211139 ./app-editors/scite/scite-4.3.2.ebuild
 2004281109 ./app-editors/scite/scite-4.3.3.ebuild
-1912151739 ./app-editors/shed/shed-1.15.ebuild
+2005141809 ./app-editors/shed/shed-1.15.ebuild
 2003271051 ./app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
 1904012309 ./app-editors/tea/tea-47.0.0.ebuild
 2001300009 ./app-editors/teco/teco-36_p19940820.ebuild
@@ -2431,11 +2437,14 @@
 2004271009 ./app-emulation/libvirt/libvirt-9999.ebuild
 2005091109 ./app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
 1902172109 ./app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+2005150839 ./app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
 1910122139 ./app-emulation/lxc/lxc-3.0.3.ebuild
 1910122139 ./app-emulation/lxc/lxc-3.1.0-r1.ebuild
 2001051415 ./app-emulation/lxc/lxc-2.1.1-r1.ebuild
+2005150839 ./app-emulation/lxc/lxc-4.0.1.ebuild
 1912110241 ./app-emulation/lxd/lxd-3.14.ebuild
 1912111539 ./app-emulation/lxd/lxd-3.16-r1.ebuild
+2005151209 ./app-emulation/lxd/lxd-4.0.1.ebuild
 1901181209 ./app-emulation/nemu/nemu-2.1.0.ebuild
 1903040109 ./app-emulation/nemu/nemu-2.2.0.ebuild
 1802120109 ./app-emulation/nemu/nemu-9999.ebuild
@@ -2453,7 +2462,7 @@
 2004201309 ./app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
 1905191439 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
 2001291739 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0-r1.ebuild
-1904281939 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
+2005140909 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
 2004270309 ./app-emulation/qemu/qemu-4.2.0-r6.ebuild
 2005010309 ./app-emulation/qemu/qemu-5.0.0.ebuild
 2005010309 ./app-emulation/qemu/qemu-9999.ebuild
@@ -2719,8 +2728,8 @@
 1912110241 ./app-i18n/fcitx/fcitx-4.9999.ebuild
 1707181652 ./app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
 2004032241 ./app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
-2005121739 ./app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
-2005121739 ./app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
+2005141809 ./app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
+2005141809 ./app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
 2001051415 ./app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
 1708161838 ./app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
 1708161838 ./app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
@@ -2838,7 +2847,6 @@
 1908281739 ./app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
 2004302209 ./app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
 2004302209 ./app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
-2002111509 ./app-i18n/transifex-client/transifex-client-0.12.4.ebuild
 2005131339 ./app-i18n/transifex-client/transifex-client-0.13.9.ebuild
 1912210209 ./app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
 2002031439 ./app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
@@ -3534,9 +3542,9 @@
 2003170039 ./app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
 2003170039 ./app-office/libreoffice/libreoffice-6.3.5.2.ebuild
 2004101709 ./app-office/libreoffice/libreoffice-6.3.9999.ebuild
-2004162209 ./app-office/libreoffice/libreoffice-6.4.3.2.ebuild
 2004162209 ./app-office/libreoffice/libreoffice-6.4.9999.ebuild
 2004162209 ./app-office/libreoffice/libreoffice-9999.ebuild
+2005142339 ./app-office/libreoffice/libreoffice-6.4.3.2.ebuild
 2003210109 ./app-office/lyx/lyx-2.3.3.ebuild
 1912210209 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
 2004032241 ./app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -3575,9 +3583,9 @@
 2004140239 ./app-office/texstudio/texstudio-2.12.20.ebuild
 2004140309 ./app-office/texstudio/texstudio-2.12.22.ebuild
 2004190439 ./app-office/texstudio/texstudio-9999.ebuild
-2001062209 ./app-office/unoconv/unoconv-0.9.0.ebuild
 2001062039 ./app-office/unoconv/unoconv-0.9.ebuild
 2002101509 ./app-office/unoconv/unoconv-0.8.2.ebuild
+2005141639 ./app-office/unoconv/unoconv-0.9.0.ebuild
 2002101339 ./app-office/upwork/upwork-5.3.3.860.ebuild
 1612040405 ./app-office/worklog-assistant-bin/worklog-assistant-bin-2.1.3580.ebuild
 2001280109 ./app-office/wps-office/wps-office-11.1.0.9080.ebuild
@@ -3695,8 +3703,8 @@
 2001160809 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-4.ebuild
 2003261841 ./app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
 2004211009 ./app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
-2004211009 ./app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
 2004250309 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
+2005140139 ./app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
 1910111840 ./app-portage/no-distcc-env/no-distcc-env-9999.ebuild
 2003191309 ./app-portage/overlint/overlint-0.5.3-r1.ebuild
 2005121009 ./app-portage/overlint/overlint-0.5.3-r2.ebuild
@@ -3706,7 +3714,7 @@
 2004191740 ./app-portage/pfl/pfl-3.1.ebuild
 2003261841 ./app-portage/portage-utils/portage-utils-9999.ebuild
 2004211009 ./app-portage/portage-utils/portage-utils-0.80.ebuild
-2005042139 ./app-portage/portage-utils/portage-utils-0.87.ebuild
+2005151509 ./app-portage/portage-utils/portage-utils-0.87.ebuild
 2005022009 ./app-portage/porticron/porticron-0.7.1.ebuild
 2005081846 ./app-portage/portpeek/portpeek-2.1.27-r1.ebuild
 2002110009 ./app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -3865,6 +3873,7 @@
 2003270209 ./app-text/calibre/calibre-4.12.0.ebuild
 2003270209 ./app-text/calibre/calibre-4.9.1-r2.ebuild
 2005050809 ./app-text/calibre/calibre-4.15.0.ebuild
+2005151139 ./app-text/calibre/calibre-4.16.0.ebuild
 2001081609 ./app-text/capyt/capyt-1.1.1.ebuild
 2002171539 ./app-text/catdoc/catdoc-0.95-r1.ebuild
 1809091139 ./app-text/cb2bib/cb2bib-1.9.8.ebuild
@@ -3928,7 +3937,7 @@
 2004211009 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
 2004260639 ./app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
 2004211009 ./app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
-2004032241 ./app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+2005140039 ./app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
 2002111509 ./app-text/doconce/doconce-1.4.4.ebuild
 1911170839 ./app-text/docx2txt/docx2txt-1.4.ebuild
 2003261841 ./app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -4047,8 +4056,8 @@
 2002081639 ./app-text/libebook/libebook-0.1.3.ebuild
 1912110241 ./app-text/libepubgen/libepubgen-0.1.1.ebuild
 1912110241 ./app-text/libetonyek/libetonyek-0.1.9.ebuild
-2003170109 ./app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
 2003170109 ./app-text/libetonyek/libetonyek-9999.ebuild
+2005142339 ./app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
 2004032241 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
 1905102109 ./app-text/libgepub/libgepub-0.6.0.ebuild
 2004032241 ./app-text/libgxps/libgxps-0.3.1.ebuild
@@ -4163,8 +4172,8 @@
 2004032241 ./app-text/poppler-data/poppler-data-0.4.9.ebuild
 2004052009 ./app-text/poppler/poppler-0.87.0.ebuild
 2004112339 ./app-text/poppler/poppler-0.85.0.ebuild
-2004291509 ./app-text/poppler/poppler-0.88.0.ebuild
 2004291509 ./app-text/poppler/poppler-9999.ebuild
+2005142039 ./app-text/poppler/poppler-0.88.0-r1.ebuild
 2004032241 ./app-text/ps2eps/ps2eps-1.68.ebuild
 2005031640 ./app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
 2005031640 ./app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
@@ -4182,8 +4191,8 @@
 2001201509 ./app-text/qpdfview/qpdfview-0.4.18.ebuild
 1702282250 ./app-text/queequeg/queequeg-0.91-r2.ebuild
 2004032241 ./app-text/rarian/rarian-0.8.1-r3.ebuild
-2003261841 ./app-text/recode/recode-3.7_pre20140303.ebuild
 2004032241 ./app-text/recode/recode-3.6_p20-r1.ebuild
+2005151339 ./app-text/recode/recode-3.7.6.ebuild
 1702282250 ./app-text/reed/reed-5.4.ebuild
 2002230040 ./app-text/refbase/refbase-0.9.6_p20180223.ebuild
 2002230040 ./app-text/referencer/referencer-1.2.2-r1.ebuild
@@ -4998,7 +5007,7 @@
 1912110241 ./dev-cpp/muParser/muParser-2.2.6.1.ebuild
 1912312039 ./dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
 1912312039 ./dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild
-2001161909 ./dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
+2005150339 ./dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild
 2004032241 ./dev-cpp/pangomm/pangomm-2.42.0.ebuild
 2004221739 ./dev-cpp/pangomm/pangomm-2.42.1.ebuild
 1702282250 ./dev-cpp/picojson/picojson-1.3.0.ebuild
@@ -5169,8 +5178,8 @@
 2004032241 ./dev-db/mysql/mysql-5.7.27-r1.ebuild
 2004210339 ./dev-db/mysql/mysql-8.0.19-r1.ebuild
 2005031839 ./dev-db/mysql/mysql-5.7.29.ebuild
-2005101339 ./dev-db/mysql/mysql-5.7.30.ebuild
-2005101339 ./dev-db/mysql/mysql-8.0.20.ebuild
+2005150039 ./dev-db/mysql/mysql-5.7.30.ebuild
+2005150039 ./dev-db/mysql/mysql-8.0.20.ebuild
 1804060238 ./dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
 1904100139 ./dev-db/mysqltuner/mysqltuner-1.7.13.ebuild
 1907312209 ./dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
@@ -5242,13 +5251,18 @@
 2002031439 ./dev-db/postgis/postgis-2.5.3-r1.ebuild
 2002262039 ./dev-db/postgis/postgis-3.0.0-r1.ebuild
 2002262039 ./dev-db/postgis/postgis-9999.ebuild
-2002231739 ./dev-db/postgresql/postgresql-9999.ebuild
 2004032241 ./dev-db/postgresql/postgresql-10.12.ebuild
 2004032241 ./dev-db/postgresql/postgresql-11.7.ebuild
 2004032241 ./dev-db/postgresql/postgresql-12.2.ebuild
-2004032241 ./dev-db/postgresql/postgresql-9.6.17.ebuild
-2005060009 ./dev-db/postgresql/postgresql-9.4.26.ebuild
-2005060009 ./dev-db/postgresql/postgresql-9.5.21.ebuild
+2005151639 ./dev-db/postgresql/postgresql-10.13.ebuild
+2005151639 ./dev-db/postgresql/postgresql-11.8.ebuild
+2005151639 ./dev-db/postgresql/postgresql-12.3.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9.4.26.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9.5.21.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9.5.22.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9.6.17.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9.6.18.ebuild
+2005151639 ./dev-db/postgresql/postgresql-9999.ebuild
 2002112051 ./dev-db/pspg/pspg-1.6.5.ebuild
 2002112051 ./dev-db/pspg/pspg-1.6.8.ebuild
 2002112051 ./dev-db/pspg/pspg-2.5.4.ebuild
@@ -5264,6 +5278,7 @@
 1912110241 ./dev-db/redis/redis-5.0.5.ebuild
 2001020209 ./dev-db/redis/redis-5.0.7.ebuild
 2003251639 ./dev-db/redis/redis-5.0.8.ebuild
+2005150209 ./dev-db/redis/redis-5.0.9.ebuild
 1702282250 ./dev-db/repmgr/repmgr-3.0.1.ebuild
 1707041643 ./dev-db/repmgr/repmgr-3.3.2.ebuild
 2005130239 ./dev-db/rqlite/rqlite-5.2.0.ebuild
@@ -7469,6 +7484,7 @@
 1702282250 ./dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
 1803011208 ./dev-java/ical4j/ical4j-1.0.5.ebuild
 2003311039 ./dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild
+2005151509 ./dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
 1912110241 ./dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
 1702282250 ./dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
 1905180439 ./dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -7873,7 +7889,6 @@
 1910181339 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
 1911232009 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
 2004230939 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
-2004231409 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
 2005121609 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild
 2005131339 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild
 2005131138 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
@@ -8119,6 +8134,9 @@
 2004201639 ./dev-lang/php/php-7.2.30.ebuild
 2004201639 ./dev-lang/php/php-7.3.17.ebuild
 2004202009 ./dev-lang/php/php-7.4.5.ebuild
+2005142139 ./dev-lang/php/php-7.2.31.ebuild
+2005142239 ./dev-lang/php/php-7.3.18.ebuild
+2005142309 ./dev-lang/php/php-7.4.6.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.4.1.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.5.0.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.5.1.ebuild
@@ -8136,6 +8154,7 @@
 2004301309 ./dev-lang/python/python-3.9.0_alpha6.ebuild
 2005072039 ./dev-lang/python/python-3.7.7-r2.ebuild
 2005122339 ./dev-lang/python/python-3.8.2-r2.ebuild
+2005140939 ./dev-lang/python/python-3.8.3.ebuild
 1809090439 ./dev-lang/qu-prolog/qu-prolog-10.1.ebuild
 2003211639 ./dev-lang/qu-prolog/qu-prolog-10.2.ebuild
 1912110241 ./dev-lang/rakudo/rakudo-2019.03.ebuild
@@ -8186,9 +8205,9 @@
 1807050039 ./dev-lang/squirrel/squirrel-3.1.ebuild
 2002122139 ./dev-lang/srf/srf-1.0-r2.ebuild
 1911181239 ./dev-lang/swi-prolog/swi-prolog-8.0.3.ebuild
-2005101838 ./dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
-2005111238 ./dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
 2005131009 ./dev-lang/swi-prolog/swi-prolog-8.1.29.ebuild
+2005141239 ./dev-lang/swi-prolog/swi-prolog-8.1.30.ebuild
+2005151139 ./dev-lang/swi-prolog/swi-prolog-8.1.31.ebuild
 2003261841 ./dev-lang/swig/swig-4.0.0.ebuild
 2004032241 ./dev-lang/swig/swig-3.0.12.ebuild
 1912110241 ./dev-lang/tcc/tcc-9999.ebuild
@@ -8221,7 +8240,7 @@
 2005112139 ./dev-lang/yap/yap-6.3.3-r1.ebuild
 1911291145 ./dev-lang/yasm/yasm-1.2.0-r1.ebuild
 2004242009 ./dev-lang/yasm/yasm-1.3.0.ebuild
-2004242039 ./dev-lang/yasm/yasm-9999.ebuild
+2005140239 ./dev-lang/yasm/yasm-9999.ebuild
 1908072139 ./dev-lang/zig/zig-0.4.0-r1.ebuild
 2001061539 ./dev-lang/zig/zig-0.5.0.ebuild
 2001061539 ./dev-lang/zig/zig-9999.ebuild
@@ -8280,6 +8299,7 @@
 2002110009 ./dev-libs/botan/botan-2.9.0.ebuild
 2004220039 ./dev-libs/botan/botan-2.11.0.ebuild
 2004270139 ./dev-libs/botan/botan-2.14.0.ebuild
+2005150239 ./dev-libs/botan/botan-2.14.0-r1.ebuild
 1911180209 ./dev-libs/busybee/busybee-0.7.0.ebuild
 1912110241 ./dev-libs/c-blosc/c-blosc-1.11.2.ebuild
 1706151341 ./dev-libs/c-capnproto/c-capnproto-0.3.ebuild
@@ -8333,7 +8353,7 @@
 2002220009 ./dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild
 1910071309 ./dev-libs/cvector/cvector-1.0.3.1.ebuild
 2002222009 ./dev-libs/cxxtools/cxxtools-2.2.1.ebuild
-1904190409 ./dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+2005150139 ./dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
 2004032241 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
 1909152040 ./dev-libs/d0_blind_id/d0_blind_id-0.5.ebuild
 1705181200 ./dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -8469,8 +8489,9 @@
 2002151310 ./dev-libs/jerasure/jerasure-2.0.0-r1.ebuild
 2004032241 ./dev-libs/json-c/json-c-0.12.ebuild
 2004090009 ./dev-libs/json-c/json-c-0.13.1-r1.ebuild
-2005121709 ./dev-libs/json-c/json-c-0.14-r1.ebuild
 2005121709 ./dev-libs/json-c/json-c-9999.ebuild
+2005150109 ./dev-libs/json-c/json-c-0.14-r1.ebuild
+2005151509 ./dev-libs/json-c/json-c-0.14-r2.ebuild
 2004032241 ./dev-libs/json-glib/json-glib-1.4.4.ebuild
 2004032241 ./dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
 2005031339 ./dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
@@ -8733,7 +8754,7 @@
 2002230040 ./dev-libs/libowfat/libowfat-0.31-r1.ebuild
 2004032241 ./dev-libs/libp11/libp11-0.4.10.ebuild
 1912110241 ./dev-libs/libparserutils/libparserutils-0.2.3.ebuild
-1912110241 ./dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+2005140039 ./dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
 2003080109 ./dev-libs/libpcre-debian/libpcre-debian-8-r2.ebuild
 2003261841 ./dev-libs/libpcre/libpcre-8.44.ebuild
 2004211009 ./dev-libs/libpcre/libpcre-8.42.ebuild
@@ -8769,6 +8790,7 @@
 2002101639 ./dev-libs/librelp/librelp-1.5.0.ebuild
 2004290209 ./dev-libs/librelp/librelp-1.6.0.ebuild
 2004032241 ./dev-libs/librep/librep-0.92.6.ebuild
+2005151009 ./dev-libs/librep/librep-0.92.7.ebuild
 2001271309 ./dev-libs/libreport/libreport-2.10.0.ebuild
 2004260509 ./dev-libs/libreport/libreport-2.12.0.ebuild
 2004260509 ./dev-libs/libreport/libreport-2.13.0.ebuild
@@ -8821,7 +8843,7 @@
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
 2004211009 ./dev-libs/libtommath/libtommath-1.1.0.ebuild
 1911300139 ./dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
-2002191639 ./dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
+2005150139 ./dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
 1911180239 ./dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
 1806260039 ./dev-libs/libtsm/libtsm-3.ebuild
 1910242009 ./dev-libs/libtsm/libtsm-4.0.1.ebuild
@@ -8898,7 +8920,7 @@
 2004032241 ./dev-libs/lzo/lzo-2.10.ebuild
 1808291709 ./dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
 2004051339 ./dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
-1702282250 ./dev-libs/maloc/maloc-1.5-r1.ebuild
+2005142209 ./dev-libs/maloc/maloc-1.5-r1.ebuild
 1909290609 ./dev-libs/marisa/marisa-9999.ebuild
 2002081609 ./dev-libs/marisa/marisa-0.2.5.ebuild
 2001101209 ./dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -8958,7 +8980,7 @@
 2004230939 ./dev-libs/ntl/ntl-11.4.3.ebuild
 1908121539 ./dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
 2004100039 ./dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
-2005121609 ./dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+2005150039 ./dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
 1807171709 ./dev-libs/onigmo/onigmo-6.1.3.ebuild
 1912062339 ./dev-libs/oniguruma/oniguruma-9999.ebuild
 2004032241 ./dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -8988,14 +9010,11 @@
 1702282327 ./dev-libs/papi/papi-5.5.1.ebuild
 1912111539 ./dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
 1912111539 ./dev-libs/pcc-libs/pcc-libs-9999.ebuild
-2005132039 ./dev-libs/pcl/pcl-1.12-r1.ebuild
+2005150039 ./dev-libs/pcl/pcl-1.12-r1.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-2.0.0.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-2.0_pre1.ebuild
 2002112051 ./dev-libs/pegtl/pegtl-2.1.4.ebuild
-2001201609 ./dev-libs/pigpio/pigpio-73.ebuild
-2002060939 ./dev-libs/pigpio/pigpio-74.ebuild
-2002111539 ./dev-libs/pigpio/pigpio-72.ebuild
 2005042039 ./dev-libs/pigpio/pigpio-76.ebuild
 2004032241 ./dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
 2002112051 ./dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -9182,8 +9201,7 @@
 2004032241 ./dev-libs/yajl/yajl-2.1.0-r1.ebuild
 2004032241 ./dev-libs/yajl/yajl-2.1.0-r2.ebuild
 2003261841 ./dev-libs/yaz/yaz-3.0.53.ebuild
-2002230040 ./dev-libs/zlog/zlog-1.2.12-r1.ebuild
-2002230040 ./dev-libs/zlog/zlog-1.2.12.ebuild
+2005151039 ./dev-libs/zlog/zlog-1.2.14.ebuild
 1912110241 ./dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
 1912110241 ./dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
 1912110241 ./dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
@@ -9210,10 +9228,11 @@
 2004262339 ./dev-libs/ncnn/ncnn-20200413.ebuild
 2004230309 ./dev-libs/libjcat/libjcat-0.1.1.ebuild
 2004271909 ./dev-libs/libjcat/libjcat-0.1.2.ebuild
-2005121609 ./dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
+2005150039 ./dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
 2004112309 ./dev-libs/libudfread/libudfread-9999.ebuild
 2005060409 ./dev-libs/libudfread/libudfread-1.0.0.ebuild
 2004240039 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
+2005140039 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
 1912111539 ./dev-lisp/abcl/abcl-1.5.0.ebuild
 1710302307 ./dev-lisp/alexandria/alexandria-20171029.ebuild
 1911181939 ./dev-lisp/asdf/asdf-3.3.1.ebuild
@@ -9363,7 +9382,7 @@
 2005051209 ./dev-ml/camlp4/camlp4-4.04_p1.ebuild
 2005051209 ./dev-ml/camlp4/camlp4-4.05_p1.ebuild
 2005051209 ./dev-ml/camlp4/camlp4-4.08_p1.ebuild
-2005131639 ./dev-ml/camlp5/camlp5-7.11.ebuild
+2005140909 ./dev-ml/camlp5/camlp5-7.11.ebuild
 1911190109 ./dev-ml/camlpdf/camlpdf-2.3.ebuild
 1912272239 ./dev-ml/camlpdf/camlpdf-2.3.1.ebuild
 2003271609 ./dev-ml/camlzip/camlzip-1.06.ebuild
@@ -9421,8 +9440,8 @@
 1708021422 ./dev-ml/jsonm/jsonm-1.0.1.ebuild
 2004032241 ./dev-ml/lablgl/lablgl-1.05-r1.ebuild
 2003202339 ./dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
-2003232109 ./dev-ml/lablgtk/lablgtk-2.18.10.ebuild
 2004032241 ./dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+2005142339 ./dev-ml/lablgtk/lablgtk-2.18.10.ebuild
 2004032241 ./dev-ml/labltk/labltk-8.06.2.ebuild
 2004032241 ./dev-ml/labltk/labltk-8.06.7.ebuild
 1912071240 ./dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild
@@ -9813,6 +9832,7 @@
 2005131739 ./dev-perl/Cache-Simple-TimedExpiry/Cache-Simple-TimedExpiry-0.270.0-r2.ebuild
 1704112111 ./dev-perl/Cache/Cache-2.110.0.ebuild
 1906051109 ./dev-perl/Cairo-GObject/Cairo-GObject-1.4.0-r1.ebuild
+2005140039 ./dev-perl/Cairo-GObject/Cairo-GObject-1.5.0.ebuild
 2004032241 ./dev-perl/Cairo/Cairo-1.106.0.ebuild
 2005131839 ./dev-perl/Cairo/Cairo-1.107.0.ebuild
 1912110241 ./dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
@@ -10412,7 +10432,7 @@
 1806102239 ./dev-perl/IO-Util/IO-Util-1.500.0-r2.ebuild
 2004032241 ./dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
 1702282250 ./dev-perl/IP-Anonymous/IP-Anonymous-0.40.0-r1.ebuild
-2004032241 ./dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
+2005140039 ./dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
 2004032241 ./dev-perl/IPC-Run3/IPC-Run3-0.48.0.ebuild
 2004290039 ./dev-perl/IPC-ShareLite/IPC-ShareLite-0.170.0-r1.ebuild
 1702282250 ./dev-perl/IPC-Shareable/IPC-Shareable-0.610.0-r1.ebuild
@@ -11187,7 +11207,7 @@
 1912110241 ./dev-perl/Tie-Sub/Tie-Sub-1.1.0-r1.ebuild
 1912110241 ./dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
 1912110241 ./dev-perl/Time-Duration-Parse/Time-Duration-Parse-0.130.0.ebuild
-2004032241 ./dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
+2005140039 ./dev-perl/Time-Duration/Time-Duration-1.200.0.ebuild
 1912110241 ./dev-perl/Time-Format/Time-Format-1.120.0-r1.ebuild
 1912110241 ./dev-perl/Time-Moment/Time-Moment-0.430.0.ebuild
 1912110241 ./dev-perl/Time-Monotonic/Time-Monotonic-0.9.8.ebuild
@@ -11488,7 +11508,7 @@
 2004032241 ./dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
 1912110241 ./dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild
 2004032241 ./dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
-2005101209 ./dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
+2005140209 ./dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
 2002112051 ./dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
 2004032241 ./dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
 2002230040 ./dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
@@ -11503,7 +11523,7 @@
 2004032241 ./dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
 2002230040 ./dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
 2004032241 ./dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
-2005101209 ./dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
+2005140209 ./dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
 2002112051 ./dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
 1912110241 ./dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
 2004032241 ./dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
@@ -11667,11 +11687,7 @@
 1707101834 ./dev-php/onphp/onphp-1.0.11_pre20141124.ebuild
 2003261841 ./dev-php/pear/pear-1.10.3.ebuild
 2004032241 ./dev-php/pear/pear-1.10.1-r1.ebuild
-1910151639 ./dev-php/pecl-amqp/pecl-amqp-1.9.4-r1.ebuild
-1902132009 ./dev-php/pecl-amqp/pecl-amqp-1.9.4.ebuild
 2004300039 ./dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild
-1910012209 ./dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
-1910012209 ./dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
 2003211239 ./dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
 1912130339 ./dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
 1912130339 ./dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild
@@ -11688,12 +11704,10 @@
 2001301909 ./dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
 1911291639 ./dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
 2004300039 ./dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild
-1810141239 ./dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
-1910141639 ./dev-php/pecl-mailparse/pecl-mailparse-3.0.3-r1.ebuild
 2005061739 ./dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild
 1901221209 ./dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild
 1901190639 ./dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild
-2005101209 ./dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+2005140209 ./dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
 1912230139 ./dev-php/pecl-memcache/pecl-memcache-4.0.5.2.ebuild
 2002112139 ./dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
 2002230040 ./dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
@@ -11838,7 +11852,7 @@
 2003261841 ./dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
 2003261841 ./dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
 2001051415 ./dev-python/3to2/3to2-1.1.1-r1.ebuild
-2003162209 ./dev-python/APScheduler/APScheduler-3.5.3.ebuild
+2005151009 ./dev-python/APScheduler/APScheduler-3.6.3.ebuild
 2004150839 ./dev-python/Babel/Babel-2.8.0-r1.ebuild
 2005111309 ./dev-python/BitVector/BitVector-3.4.9.ebuild
 2001051415 ./dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
@@ -11935,7 +11949,7 @@
 2004261339 ./dev-python/audioread/audioread-2.1.8-r2.ebuild
 2003071209 ./dev-python/authheaders/authheaders-0.13.0.ebuild
 2003192209 ./dev-python/authres/authres-0.800.ebuild
-2004200009 ./dev-python/authres/authres-1.2.0.ebuild
+2005141639 ./dev-python/authres/authres-1.2.0.ebuild
 2003171039 ./dev-python/autobahn/autobahn-17.5.1-r2.ebuild
 2004170939 ./dev-python/autobahn/autobahn-18.3.1.ebuild
 2005101139 ./dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -11974,7 +11988,6 @@
 2005111309 ./dev-python/betamax/betamax-0.8.1.ebuild
 2002041639 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
 2002112309 ./dev-python/billiard/billiard-3.6.0.0.ebuild
-2002041639 ./dev-python/binaryornot/binaryornot-0.4.3.ebuild
 2005121609 ./dev-python/binaryornot/binaryornot-0.4.4.ebuild
 2003251909 ./dev-python/bitarray/bitarray-0.8.3.ebuild
 2005111309 ./dev-python/bitstring/bitstring-3.1.6.ebuild
@@ -12003,7 +12016,6 @@
 2005120639 ./dev-python/botocore/botocore-9999.ebuild
 2004041809 ./dev-python/bottle/bottle-0.12.18.ebuild
 2003071839 ./dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
-2003251909 ./dev-python/bpython/bpython-0.18.ebuild
 2005121009 ./dev-python/bpython/bpython-0.19.ebuild
 2005021639 ./dev-python/breathe/breathe-4.14.1.ebuild
 2004271239 ./dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
@@ -12086,8 +12098,6 @@
 2003251909 ./dev-python/colorlog/colorlog-3.1.4.ebuild
 2002230040 ./dev-python/colorspacious/colorspacious-1.1.0.ebuild
 2005032239 ./dev-python/colorspacious/colorspacious-1.1.2.ebuild
-2003250109 ./dev-python/commonmark/commonmark-0.5.4.ebuild
-2004032241 ./dev-python/commonmark/commonmark-0.8.1.ebuild
 2005111839 ./dev-python/commonmark/commonmark-0.9.1.ebuild
 2004231409 ./dev-python/configargparse/configargparse-1.1.ebuild
 2004240909 ./dev-python/configargparse/configargparse-1.2.3.ebuild
@@ -12127,6 +12137,7 @@
 2001131309 ./dev-python/cursive/cursive-0.2.2.ebuild
 2005111309 ./dev-python/curtsies/curtsies-0.3.0-r2.ebuild
 2004200239 ./dev-python/cvxopt/cvxopt-1.2.5.ebuild
+2005140009 ./dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
 2005111309 ./dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
 2001051415 ./dev-python/cycler/cycler-0.10.0.ebuild
 2005040939 ./dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -12149,7 +12160,8 @@
 2003192209 ./dev-python/demjson/demjson-2.2.4.ebuild
 2003240109 ./dev-python/denonavr/denonavr-0.8.1.ebuild
 2003161509 ./dev-python/deprecated/deprecated-1.2.7.ebuild
-2004111109 ./dev-python/deprecated/deprecated-1.2.9.ebuild
+2005140909 ./dev-python/deprecated/deprecated-1.2.10.ebuild
+2005151339 ./dev-python/deprecated/deprecated-1.2.9.ebuild
 2003251909 ./dev-python/deprecation/deprecation-2.0.7.ebuild
 2001051415 ./dev-python/dexml/dexml-0.5.1.ebuild
 2002050909 ./dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
@@ -12186,9 +12198,9 @@
 2001051415 ./dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
 2001262339 ./dev-python/django-taggit/django-taggit-1.2.0.ebuild
 2001270009 ./dev-python/django-timezone-field/django-timezone-field-4.0.ebuild
-2004021239 ./dev-python/django/django-2.2.12.ebuild
 2004281639 ./dev-python/django/django-2.2.11.ebuild
-2005121909 ./dev-python/django/django-3.0.6.ebuild
+2005141509 ./dev-python/django/django-2.2.12.ebuild
+2005141509 ./dev-python/django/django-3.0.6.ebuild
 2004211509 ./dev-python/django_polymorphic/django_polymorphic-2.1.2.ebuild
 2003120139 ./dev-python/djangorestframework/djangorestframework-3.11.0.ebuild
 2003192209 ./dev-python/dkimpy/dkimpy-0.9.2.ebuild
@@ -12354,8 +12366,9 @@
 2001051415 ./dev-python/gntp/gntp-1.0.3.ebuild
 2002051909 ./dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
 2002051909 ./dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
-2005131009 ./dev-python/google-api-python-client/google-api-python-client-1.8.3.ebuild
+2005150039 ./dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
 2005070609 ./dev-python/google-apitools/google-apitools-0.5.30_p20200507.ebuild
+2005151009 ./dev-python/google-apitools/google-apitools-0.5.31.ebuild
 2004032241 ./dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
 2002051909 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
 2005130709 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
@@ -12390,7 +12403,7 @@
 2002051739 ./dev-python/h11/h11-0.8.1.ebuild
 2004271039 ./dev-python/h11/h11-0.9.0.ebuild
 2003251909 ./dev-python/h5py/h5py-2.10.0.ebuild
-2005131809 ./dev-python/h5py/h5py-2.10.0-r1.ebuild
+2005141109 ./dev-python/h5py/h5py-2.10.0-r1.ebuild
 2004040109 ./dev-python/hacking/hacking-2.0.0.ebuild
 2002211609 ./dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
 2005061039 ./dev-python/hcloud-python/hcloud-python-1.6.3-r1.ebuild
@@ -12410,7 +12423,7 @@
 2004081709 ./dev-python/httplib2/httplib2-0.17.0.ebuild
 2003271509 ./dev-python/httpretty/httpretty-0.9.6.ebuild
 2004021509 ./dev-python/httpretty/httpretty-1.0.2.ebuild
-2004271239 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+2005151339 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
 2004212139 ./dev-python/httpstat/httpstat-1.2.1-r1.ebuild
 2001231309 ./dev-python/humanfriendly/humanfriendly-4.18.ebuild
 2002051739 ./dev-python/humanize/humanize-0.5.1.ebuild
@@ -12453,7 +12466,7 @@
 2003081409 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
 2002112309 ./dev-python/ioflo/ioflo-1.7.5.ebuild
 2005131809 ./dev-python/ioflo/ioflo-2.0.0.ebuild
-2003251609 ./dev-python/ipaddr/ipaddr-2.2.0.ebuild
+2005150709 ./dev-python/ipaddr/ipaddr-2.2.0.ebuild
 2004032241 ./dev-python/ipaddress/ipaddress-1.0.23.ebuild
 2004231209 ./dev-python/ipdb/ipdb-0.10.3.ebuild
 2001051415 ./dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
@@ -12483,7 +12496,7 @@
 2004271709 ./dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
 2005040939 ./dev-python/jaraco-functools/jaraco-functools-3.0.0.ebuild
 2003251609 ./dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
-2005132039 ./dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+2005141109 ./dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
 1912311839 ./dev-python/jaraco-logging/jaraco-logging-3.0.0-r1.ebuild
 2002051839 ./dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
 2002051839 ./dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
@@ -12898,7 +12911,7 @@
 2001051415 ./dev-python/pocketlint/pocketlint-0.20.ebuild
 2004032241 ./dev-python/pocketlint/pocketlint-0.17.ebuild
 2002052239 ./dev-python/pockets/pockets-0.5.1.ebuild
-2005121809 ./dev-python/pockets/pockets-0.9.1.ebuild
+2005140039 ./dev-python/pockets/pockets-0.9.1.ebuild
 2001051415 ./dev-python/podcastparser/podcastparser-0.6.4.ebuild
 2004032241 ./dev-python/polib/polib-1.1.0-r1.ebuild
 2004251239 ./dev-python/polygon/polygon-3.0.7.ebuild
@@ -13144,7 +13157,7 @@
 2004180139 ./dev-python/pysnmp/pysnmp-999999.ebuild
 2005102109 ./dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
 2003171139 ./dev-python/pyspf/pyspf-2.0.12.ebuild
-2004200009 ./dev-python/pyspf/pyspf-2.0.14.ebuild
+2005151339 ./dev-python/pyspf/pyspf-2.0.14.ebuild
 2002052309 ./dev-python/pysrt/pysrt-1.1.1.ebuild
 2002052309 ./dev-python/pysrt/pysrt-9999.ebuild
 2005091109 ./dev-python/pysrt/pysrt-1.1.2.ebuild
@@ -13309,8 +13322,8 @@
 2002060009 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
 2001131309 ./dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
 2001051415 ./dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
-2002060009 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
-2002060009 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+2005141839 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+2005141839 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
 2003201309 ./dev-python/pythondialog/pythondialog-3.4.0.ebuild
 2004032241 ./dev-python/pythondialog/pythondialog-3.3.0.ebuild
 2001051415 ./dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
@@ -13463,6 +13476,7 @@
 2004042009 ./dev-python/setuptools/setuptools-46.1.3.ebuild
 2005131439 ./dev-python/setuptools/setuptools-44.1.0.ebuild
 2005131439 ./dev-python/setuptools/setuptools-46.2.0.ebuild
+2005140909 ./dev-python/setuptools/setuptools-46.3.0.ebuild
 2004211009 ./dev-python/setuptools_scm/setuptools_scm-3.5.0.ebuild
 2001081439 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
 2004302039 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -13486,7 +13500,7 @@
 2003221409 ./dev-python/sip/sip-4.19.21.ebuild
 2004032241 ./dev-python/sip/sip-4.19.19.ebuild
 2004190439 ./dev-python/sip/sip-4.19.22.ebuild
-2004211009 ./dev-python/six/six-1.14.0.ebuild
+2005141509 ./dev-python/six/six-1.14.0.ebuild
 2003031239 ./dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
 2004261339 ./dev-python/slimit/slimit-0.8.1-r1.ebuild
 2001051415 ./dev-python/slixmpp/slixmpp-9999.ebuild
@@ -13526,7 +13540,7 @@
 2004221139 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
 2005061739 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
 2005131639 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
-2005031609 ./dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+2005140209 ./dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
 2003251909 ./dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
 2005061739 ./dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
 2005131639 ./dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -13796,7 +13810,7 @@
 2003251909 ./dev-python/zict/zict-0.1.4.ebuild
 2004032241 ./dev-python/zipp/zipp-1.0.0.ebuild
 2005111839 ./dev-python/zipp/zipp-2.0.1.ebuild
-2005132039 ./dev-python/zipp/zipp-3.1.0.ebuild
+2005141109 ./dev-python/zipp/zipp-3.1.0.ebuild
 2003081739 ./dev-python/zope-component/zope-component-4.4.1.ebuild
 2001122339 ./dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
 2002112309 ./dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -13813,7 +13827,7 @@
 2005121009 ./dev-python/zstandard/zstandard-0.13.0.ebuild
 2004081709 ./dev-python/pathspec/pathspec-0.7.0.ebuild
 2005021639 ./dev-python/pathspec/pathspec-0.8.0.ebuild
-2004032241 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+2005141939 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
 2005061009 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2004240909 ./dev-python/elementpath/elementpath-1.4.4.ebuild
@@ -13905,7 +13919,7 @@
 2004292109 ./dev-python/python-libevdev/python-libevdev-0.8.ebuild
 2003081509 ./dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
 2004032241 ./dev-python/sqlparse/sqlparse-0.3.0.ebuild
-2005131439 ./dev-python/sqlparse/sqlparse-0.3.1.ebuild
+2005141509 ./dev-python/sqlparse/sqlparse-0.3.1.ebuild
 2003102139 ./dev-python/django-pglocks/django-pglocks-1.0.4.ebuild
 2005052339 ./dev-python/GitPython/GitPython-3.1.2.ebuild
 2005111309 ./dev-python/GitPython/GitPython-3.1.1.ebuild
@@ -13941,10 +13955,11 @@
 2005070339 ./dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
 2005090409 ./dev-python/cbor2/cbor2-5.1.0.ebuild
 2005090409 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
-2005090239 ./dev-python/pypugjs/pypugjs-5.9.4.ebuild
+2005151109 ./dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
 2005101639 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
-2005130709 ./dev-python/google-api-core/google-api-core-1.17.0.ebuild
-2005130709 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+2005150039 ./dev-python/google-api-core/google-api-core-1.17.0.ebuild
+2005150039 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+2005140739 ./dev-python/bareos/bareos-19.2.7.ebuild
 2003281309 ./dev-qt/assistant/assistant-5.14.1.ebuild
 2005091109 ./dev-qt/assistant/assistant-5.14.2.ebuild
 2003281309 ./dev-qt/designer/designer-5.14.1.ebuild
@@ -13997,7 +14012,7 @@
 2003281309 ./dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
 2005091109 ./dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
 2003281309 ./dev-qt/qtlocation/qtlocation-5.14.1.ebuild
-2005091109 ./dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+2005142039 ./dev-qt/qtlocation/qtlocation-5.14.2.ebuild
 1804252238 ./dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
 2004032340 ./dev-qt/qtmultimedia/qtmultimedia-5.14.1-r1.ebuild
 2005091109 ./dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
@@ -14047,7 +14062,7 @@
 2003281309 ./dev-qt/qtwebchannel/qtwebchannel-5.14.1.ebuild
 2005091109 ./dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
 2003281309 ./dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
-2004300009 ./dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+2005142039 ./dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
 2004081309 ./dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
 2003281309 ./dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
 2005091109 ./dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
@@ -16278,7 +16293,7 @@
 2003281009 ./dev-ruby/rmagick/rmagick-4.1.0.ebuild
 2003291109 ./dev-ruby/rmagick/rmagick-4.1.1.ebuild
 2005021009 ./dev-ruby/rmagick/rmagick-4.1.2.ebuild
-2005131809 ./dev-ruby/rmagick/rmagick-3.2.0.ebuild
+2005141109 ./dev-ruby/rmagick/rmagick-3.2.0.ebuild
 1906030809 ./dev-ruby/roadie-rails/roadie-rails-1.3.0.ebuild
 2004251539 ./dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
 1905060909 ./dev-ruby/roadie/roadie-3.5.0.ebuild
@@ -17100,7 +17115,7 @@
 2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
 2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
 2002041639 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
-2005122139 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
+2005132309 ./dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
 2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
 2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
 2002041639 ./dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
@@ -17112,12 +17127,12 @@
 2002041639 ./dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
 2002041639 ./dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
 2002041639 ./dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
-2005130139 ./dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
-2005130139 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+2005140009 ./dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
+2005140009 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
 2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
 2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
 2002041639 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
-2005122139 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
+2005132309 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
 2002041639 ./dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
 2002041639 ./dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
 2002041639 ./dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -17125,8 +17140,8 @@
 2002041639 ./dev-util/buildbot/buildbot-0.9.12-r1.ebuild
 2002041639 ./dev-util/buildbot/buildbot-1.1.2.ebuild
 2002041639 ./dev-util/buildbot/buildbot-1.3.0.ebuild
-2005130139 ./dev-util/buildbot/buildbot-2.7.0.ebuild
-2005130139 ./dev-util/buildbot/buildbot-9999.ebuild
+2005140009 ./dev-util/buildbot/buildbot-2.7.0.ebuild
+2005140009 ./dev-util/buildbot/buildbot-9999.ebuild
 2002111539 ./dev-util/bumpversion/bumpversion-0.5.3.ebuild
 2002140109 ./dev-util/bustle/bustle-0.4.7-r1.ebuild
 2004132310 ./dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -17436,8 +17451,8 @@
 2005071109 ./dev-util/kdevelop/kdevelop-5.5.1.ebuild
 2002112051 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
 2002112051 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
-1907262039 ./dev-util/kernelshark/kernelshark-1.0.ebuild
-1907262039 ./dev-util/kernelshark/kernelshark-9999.ebuild
+2005150139 ./dev-util/kernelshark/kernelshark-1.0.ebuild
+2005150139 ./dev-util/kernelshark/kernelshark-9999.ebuild
 2005131809 ./dev-util/kubebuilder/kubebuilder-2.3.1.ebuild
 1910052209 ./dev-util/kup/kup-0.3.4-r1.ebuild
 1912131139 ./dev-util/kup/kup-0.3.6.ebuild
@@ -17721,8 +17736,8 @@
 1903070739 ./dev-util/tinlink/tinlink-1.0.0-r1.ebuild
 1702282250 ./dev-util/tkdiff/tkdiff-4.2.ebuild
 2002230040 ./dev-util/tmake/tmake-2.12-r1.ebuild
-2002112051 ./dev-util/trace-cmd/trace-cmd-9999.ebuild
 2005090809 ./dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+2005150139 ./dev-util/trace-cmd/trace-cmd-9999.ebuild
 2004032241 ./dev-util/treecc/treecc-0.3.10-r1.ebuild
 1904141839 ./dev-util/trinity/trinity-1.9.ebuild
 1904141839 ./dev-util/trinity/trinity-9999.ebuild
@@ -17734,9 +17749,9 @@
 2002101639 ./dev-util/umockdev/umockdev-0.12.1.ebuild
 2002101639 ./dev-util/umockdev/umockdev-0.9.4.ebuild
 1912110241 ./dev-util/uncrustify/uncrustify-0.66.1.ebuild
-1912110241 ./dev-util/uncrustify/uncrustify-0.68.1.ebuild
 1912110241 ./dev-util/uncrustify/uncrustify-0.69.0.ebuild
-1912110241 ./dev-util/uncrustify/uncrustify-9999.ebuild
+2005141209 ./dev-util/uncrustify/uncrustify-0.71.0.ebuild
+2005141209 ./dev-util/uncrustify/uncrustify-9999.ebuild
 2003261841 ./dev-util/unifdef/unifdef-2.11.ebuild
 2003261841 ./dev-util/unifdef/unifdef-2.12.ebuild
 2004211009 ./dev-util/unifdef/unifdef-2.10.ebuild
@@ -17787,7 +17802,7 @@
 2004030409 ./dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
 1912270509 ./dev-util/wasmer/wasmer-0.11.0.ebuild
 1912212309 ./dev-util/libabigail/libabigail-1.6.ebuild
-2004051039 ./dev-util/rt-tests/rt-tests-1.8.ebuild
+2005151809 ./dev-util/rt-tests/rt-tests-1.8.ebuild
 2002051009 ./dev-util/ccls/ccls-0.20190823.5.ebuild
 2004250709 ./dev-util/ccls/ccls-9999.ebuild
 2004292109 ./dev-util/ccls/ccls-0.20190823.6.ebuild
@@ -17795,7 +17810,7 @@
 2003180409 ./dev-util/ydiff/ydiff-1.1.ebuild
 2004031739 ./dev-util/sysdig-kmod/sysdig-kmod-0.26.6.ebuild
 2005051039 ./dev-util/sysdig-kmod/sysdig-kmod-0.26.7.ebuild
-2005121609 ./dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
+2005150039 ./dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
 2004041909 ./dev-util/cargo-c/cargo-c-0.6.2.ebuild
 2005011909 ./dev-util/cvise/cvise-1.1.0.ebuild
 2005101439 ./dev-util/unrpyc/unrpyc-1.1.3.ebuild
@@ -17918,7 +17933,7 @@
 2002111539 ./dev-vcs/stgit/stgit-0.20.ebuild
 2003170939 ./dev-vcs/stgit/stgit-0.21.ebuild
 2004032241 ./dev-vcs/subversion/subversion-1.12.2.ebuild
-2005132039 ./dev-vcs/subversion/subversion-1.13.0-r1.ebuild
+2005141109 ./dev-vcs/subversion/subversion-1.13.0-r1.ebuild
 1911100639 ./dev-vcs/svn2cl/svn2cl-0.12.ebuild
 1912020939 ./dev-vcs/svn2cl/svn2cl-0.14.ebuild
 1912111539 ./dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -18144,7 +18159,7 @@
 1804242238 ./games-arcade/stardork/stardork-0.7-r1.ebuild
 1910111911 ./games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
 2002112051 ./games-arcade/supertux/supertux-0.6.1.1.ebuild
-2005090439 ./games-arcade/supertux/supertux-0.6.2_rc1.ebuild
+2005151009 ./games-arcade/supertux/supertux-0.6.2.ebuild
 1804242238 ./games-arcade/syobon/syobon-1.0.1-r1.ebuild
 1912111539 ./games-arcade/tecnoballz/tecnoballz-0.92.ebuild
 1804242238 ./games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild
@@ -18745,8 +18760,8 @@
 1912121939 ./games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
 1806251639 ./games-strategy/asc/asc-2.6.0.0-r2.ebuild
 1909232109 ./games-strategy/colobot-data/colobot-data-0.1.12.ebuild
-1909241809 ./games-strategy/colobot/colobot-0.1.12.ebuild
 1909241809 ./games-strategy/colobot/colobot-9999.ebuild
+2005141339 ./games-strategy/colobot/colobot-0.1.12.ebuild
 1912062339 ./games-strategy/crimson/crimson-0.5.3-r1.ebuild
 1909232039 ./games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
 1909232039 ./games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
@@ -18950,6 +18965,7 @@
 1912151639 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
 2003112009 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33.ebuild
 2004230009 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
+2005142339 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
 2004202139 ./gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
 2004302139 ./gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
 2004202139 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
@@ -19556,7 +19572,7 @@
 2003190939 ./kde-apps/mbox-importer/mbox-importer-19.12.3.ebuild
 2005071109 ./kde-apps/mbox-importer/mbox-importer-20.04.0.ebuild
 2003190939 ./kde-apps/messagelib/messagelib-19.12.3.ebuild
-2005071109 ./kde-apps/messagelib/messagelib-20.04.0.ebuild
+2005142039 ./kde-apps/messagelib/messagelib-20.04.0-r1.ebuild
 2003190939 ./kde-apps/minuet/minuet-19.12.3.ebuild
 2005071109 ./kde-apps/minuet/minuet-20.04.0.ebuild
 2003190939 ./kde-apps/okular/okular-19.12.3-r1.ebuild
@@ -19685,7 +19701,7 @@
 2003011039 ./kde-frameworks/kinit/kinit-5.67.0.ebuild
 2005091439 ./kde-frameworks/kinit/kinit-5.70.0.ebuild
 2003011039 ./kde-frameworks/kio/kio-5.67.0-r1.ebuild
-2005091439 ./kde-frameworks/kio/kio-5.70.0.ebuild
+2005151139 ./kde-frameworks/kio/kio-5.70.0-r1.ebuild
 2003011039 ./kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild
 2005091439 ./kde-frameworks/kirigami/kirigami-5.70.0.ebuild
 2003011039 ./kde-frameworks/kitemmodels/kitemmodels-5.67.0.ebuild
@@ -19747,7 +19763,7 @@
 2003011039 ./kde-frameworks/oxygen-icons/oxygen-icons-5.67.0.ebuild
 2005091439 ./kde-frameworks/oxygen-icons/oxygen-icons-5.70.0.ebuild
 2004032340 ./kde-frameworks/plasma/plasma-5.67.0-r3.ebuild
-2005091439 ./kde-frameworks/plasma/plasma-5.70.0.ebuild
+2005142039 ./kde-frameworks/plasma/plasma-5.70.1.ebuild
 2003011039 ./kde-frameworks/prison/prison-5.67.0.ebuild
 2005091439 ./kde-frameworks/prison/prison-5.70.0.ebuild
 2003011039 ./kde-frameworks/purpose/purpose-5.67.0.ebuild
@@ -19826,8 +19842,8 @@
 2005071109 ./kde-plasma/kgamma/kgamma-5.18.5.ebuild
 2002151439 ./kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
 2005071109 ./kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
-2004032340 ./kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
-2005071109 ./kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
+2005140039 ./kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
+2005140039 ./kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
 2002151439 ./kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild
 2005071109 ./kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
 2002151439 ./kde-plasma/kscreen/kscreen-5.17.5.ebuild
@@ -19946,7 +19962,7 @@
 2003051539 ./mail-client/alot/alot-0.9.ebuild
 2003051539 ./mail-client/alot/alot-9999.ebuild
 2004230939 ./mail-client/alpine/alpine-2.22.ebuild
-2005051209 ./mail-client/alpine/alpine-2.22-r1.ebuild
+2005150139 ./mail-client/alpine/alpine-2.22-r1.ebuild
 1812021739 ./mail-client/balsa/balsa-2.5.6-r1.ebuild
 1905201439 ./mail-client/bower/bower-0.10.ebuild
 1910211739 ./mail-client/bower/bower-0.11.ebuild
@@ -19970,7 +19986,7 @@
 2004032241 ./mail-client/mailx/mailx-8.1.2.20160123.ebuild
 2004221039 ./mail-client/mailx/mailx-8.1.2.20180807.ebuild
 2003311039 ./mail-client/mutt/mutt-1.13.5.ebuild
-2005041039 ./mail-client/mutt/mutt-1.14.0.ebuild
+2005142139 ./mail-client/mutt/mutt-1.14.0-r1.ebuild
 1910111609 ./mail-client/neomutt/neomutt-20180716.ebuild
 1911060639 ./mail-client/neomutt/neomutt-99999999.ebuild
 2003132009 ./mail-client/neomutt/neomutt-20200313.ebuild
@@ -19987,7 +20003,7 @@
 2002100139 ./mail-client/roundcube/roundcube-1.4.2.ebuild
 2004201509 ./mail-client/roundcube/roundcube-1.4.3.ebuild
 2005081846 ./mail-client/roundcube/roundcube-1.4.4.ebuild
-2005111409 ./mail-client/roundcube/roundcube-1.3.11.ebuild
+2005150039 ./mail-client/roundcube/roundcube-1.3.11.ebuild
 2002230040 ./mail-client/s-nail/s-nail-14.9.13.ebuild
 2002230040 ./mail-client/s-nail/s-nail-14.9.15.ebuild
 2002230040 ./mail-client/s-nail/s-nail-14.9.16.ebuild
@@ -20019,8 +20035,8 @@
 1702282250 ./mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
 1702282250 ./mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild
 1911130409 ./mail-filter/dspam/dspam-3.10.2-r2.ebuild
-2002230040 ./mail-filter/exim-geoip/exim-geoip-0.1.ebuild
-2002230040 ./mail-filter/exim-p0f/exim-p0f-0.1.ebuild
+2005151639 ./mail-filter/exim-geoip/exim-geoip-0.1-r1.ebuild
+2005151639 ./mail-filter/exim-p0f/exim-p0f-0.1-r1.ebuild
 1702282250 ./mail-filter/gld/gld-1.7-r2.ebuild
 1902131809 ./mail-filter/gld/gld-1.7-r4.ebuild
 2003280839 ./mail-filter/imapfilter/imapfilter-2.6.16.ebuild
@@ -20526,9 +20542,7 @@
 1908281139 ./media-gfx/fim/fim-0.5_rc3.ebuild
 1911131109 ./media-gfx/flam3/flam3-3.1.1.ebuild
 1702282250 ./media-gfx/fondu/fondu-20060102-r1.ebuild
-2004032241 ./media-gfx/fontforge/fontforge-20170731-r5.ebuild
-2004062109 ./media-gfx/fontforge/fontforge-20190801.ebuild
-2005131339 ./media-gfx/fontforge/fontforge-20200314.ebuild
+2005140309 ./media-gfx/fontforge/fontforge-20200314.ebuild
 1707141045 ./media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
 1810061809 ./media-gfx/fotowall/fotowall-1.0.ebuild
 1903202039 ./media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -20591,10 +20605,8 @@
 2003152212 ./media-gfx/icoutils/icoutils-0.32.3.ebuild
 2002112051 ./media-gfx/igal/igal-2.0-r1.ebuild
 2004241309 ./media-gfx/imagemagick/imagemagick-9999.ebuild
-2005010209 ./media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
-2005010209 ./media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
-2005091939 ./media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
-2005091939 ./media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+2005151809 ./media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
+2005151809 ./media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.2.ebuild
 2002151310 ./media-gfx/imageworsener/imageworsener-1.3.3.ebuild
 2001051415 ./media-gfx/img2pdf/img2pdf-0.3.3.ebuild
@@ -20870,6 +20882,7 @@
 2004240539 ./media-libs/exiftool/exiftool-11.95.ebuild
 2005070709 ./media-libs/exiftool/exiftool-11.93.ebuild
 2005070709 ./media-libs/exiftool/exiftool-11.98.ebuild
+2005150839 ./media-libs/exiftool/exiftool-11.99.ebuild
 2004032241 ./media-libs/faac/faac-1.29.9.2.ebuild
 2004032241 ./media-libs/faad2/faad2-2.8.8.ebuild
 2004032241 ./media-libs/faad2/faad2-2.9.0.ebuild
@@ -20902,7 +20915,7 @@
 2001231539 ./media-libs/ganv/ganv-1.4.2-r1.ebuild
 1905142109 ./media-libs/gavl/gavl-1.4.0-r1.ebuild
 2004032241 ./media-libs/gd/gd-2.2.5-r2.ebuild
-2005132039 ./media-libs/gd/gd-2.3.0.ebuild
+2005141109 ./media-libs/gd/gd-2.3.0.ebuild
 2004252139 ./media-libs/gegl/gegl-0.2.0-r6.ebuild
 2004252139 ./media-libs/gegl/gegl-0.3.34.ebuild
 2004252139 ./media-libs/gegl/gegl-0.4.16.ebuild
@@ -20959,6 +20972,7 @@
 2004071209 ./media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
 2004262239 ./media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
 2004262239 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
+2005141239 ./media-libs/harfbuzz/harfbuzz-2.6.6.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 1912122040 ./media-libs/icclib/icclib-2.14.ebuild
@@ -21041,15 +21055,15 @@
 2002112051 ./media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
 1907090609 ./media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild
 2004032241 ./media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
-2003261841 ./media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
-2003261841 ./media-libs/libdvdnav/libdvdnav-9999.ebuild
-2004032241 ./media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
-2005071609 ./media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
+2005141739 ./media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+2005141739 ./media-libs/libdvdnav/libdvdnav-6.0.1.ebuild
+2005141739 ./media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
+2005141739 ./media-libs/libdvdnav/libdvdnav-9999.ebuild
 2003261841 ./media-libs/libdvdread/libdvdread-6.0.1.ebuild
 2003261841 ./media-libs/libdvdread/libdvdread-6.0.2.ebuild
-2003261841 ./media-libs/libdvdread/libdvdread-9999.ebuild
 2004032241 ./media-libs/libdvdread/libdvdread-6.0.0.ebuild
-2005071609 ./media-libs/libdvdread/libdvdread-6.1.0.ebuild
+2005141539 ./media-libs/libdvdread/libdvdread-6.1.1.ebuild
+2005141539 ./media-libs/libdvdread/libdvdread-9999.ebuild
 2004032241 ./media-libs/libebur128/libebur128-1.2.4.ebuild
 2002230040 ./media-libs/libemf/libemf-1.0.4-r1.ebuild
 2002230040 ./media-libs/libemf/libemf-1.0.7.ebuild
@@ -21171,8 +21185,8 @@
 2004142039 ./media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
 2004142039 ./media-libs/libprojectm/libprojectm-3.1.1_rc8-r1.ebuild
 2004142039 ./media-libs/libprojectm/libprojectm-3.1.2.ebuild
-2004142039 ./media-libs/libprojectm/libprojectm-3.1.3.ebuild
 2004142039 ./media-libs/libprojectm/libprojectm-9999.ebuild
+2005141739 ./media-libs/libprojectm/libprojectm-3.1.3.ebuild
 2001132339 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
 2004261239 ./media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
 2004171939 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r1.ebuild
@@ -21254,6 +21268,8 @@
 2004292109 ./media-libs/mesa/mesa-9999.ebuild
 2004302039 ./media-libs/mesa/mesa-20.0.6.ebuild
 2005070039 ./media-libs/mesa/mesa-20.1.0_rc2.ebuild
+2005142339 ./media-libs/mesa/mesa-20.0.7.ebuild
+2005142339 ./media-libs/mesa/mesa-20.1.0_rc3.ebuild
 2004252309 ./media-libs/mlt/mlt-6.20.0-r1.ebuild
 2004252309 ./media-libs/mlt/mlt-6.20.0.ebuild
 1801230038 ./media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
@@ -21438,7 +21454,7 @@
 2002241739 ./media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
 2002031909 ./media-libs/webvfx/webvfx-1.1.0.ebuild
 2004211209 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200301.ebuild
-2005020409 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
+2005141639 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
 2004111739 ./media-libs/lib3mf/lib3mf-1.8.1.ebuild
 2004261539 ./media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
 2005062039 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
@@ -21826,9 +21842,6 @@
 1911121409 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
 2002151310 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
 1702282250 ./media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
-1912111539 ./media-plugins/live/live-2018.01.29.ebuild
-1912111539 ./media-plugins/live/live-2018.07.07.ebuild
-2004202009 ./media-plugins/live/live-2017.10.28.ebuild
 2004230939 ./media-plugins/live/live-2020.03.06.ebuild
 1912221509 ./media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
 2001231539 ./media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild
@@ -22001,6 +22014,7 @@
 1911101439 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.2.ebuild
 1911101439 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
 2002191039 ./media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
+2005151539 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
 1912312209 ./media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
 1703121948 ./media-radio/adifmerg/adifmerg-31-r1.ebuild
 2002082039 ./media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -22696,6 +22710,7 @@
 2001180709 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
 2001311209 ./media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild
 2004051309 ./media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild
+2005150839 ./media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
 2004261339 ./media-video/motion/motion-4.1.1-r1.ebuild
 1811101609 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
 1908180209 ./media-video/movit/movit-1.2.0.ebuild
@@ -22720,8 +22735,8 @@
 1707282257 ./media-video/nvidia-video-codec/nvidia-video-codec-8.0.14.ebuild
 1812030039 ./media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild
 1702282250 ./media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild
-2003191909 ./media-video/obs-studio/obs-studio-9999.ebuild
-2005101509 ./media-video/obs-studio/obs-studio-25.0.8.ebuild
+2005141909 ./media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
+2005141909 ./media-video/obs-studio/obs-studio-9999.ebuild
 2002022239 ./media-video/ogmrip/ogmrip-1.0.1.ebuild
 2002092009 ./media-video/openshot/openshot-2.4.0-r1.ebuild
 2002092009 ./media-video/openshot/openshot-2.4.4-r1.ebuild
@@ -22806,7 +22821,6 @@
 1702282250 ./media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r1.ebuild
 2001252139 ./media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
 2004261239 ./media-video/videotrans/videotrans-1.6.1-r2.ebuild
-2005102339 ./media-video/vlc/vlc-3.0.8-r1.ebuild
 2005102339 ./media-video/vlc/vlc-3.0.9999.ebuild
 2005102339 ./media-video/vlc/vlc-9999.ebuild
 2005121909 ./media-video/vlc/vlc-3.0.10-r1.ebuild
@@ -22828,6 +22842,9 @@
 2003141539 ./media-video/qmplay2/qmplay2-19.12.19-r2.ebuild
 2005061509 ./media-video/qmplay2/qmplay2-20.05.02.ebuild
 2005061509 ./media-video/qmplay2/qmplay2-9999.ebuild
+2005141909 ./media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012.ebuild
+2005141909 ./media-video/vidcutter/vidcutter-6.0.0.ebuild
+2005141909 ./media-video/vidcutter/vidcutter-9999.ebuild
 2001051415 ./net-analyzer/2ping/2ping-4.2.ebuild
 2001051415 ./net-analyzer/2ping/2ping-4.3.ebuild
 1912171309 ./net-analyzer/alive/alive-2.0.2-r1.ebuild
@@ -23308,8 +23325,8 @@
 2005111439 ./net-analyzer/testssl/testssl-3.0.2.ebuild
 1905291309 ./net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
 1905291309 ./net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
-1702282250 ./net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
-2005101739 ./net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
+2005141239 ./net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
+2005141239 ./net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
 2001182109 ./net-analyzer/thrulay/thrulay-0.9-r1.ebuild
 1702282250 ./net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
 1912111540 ./net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -23340,8 +23357,6 @@
 2001281909 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
 2003221739 ./net-analyzer/zabbix/zabbix-3.0.30.ebuild
-2003221739 ./net-analyzer/zabbix/zabbix-4.0.18.ebuild
-2003221739 ./net-analyzer/zabbix/zabbix-4.4.6.ebuild
 2004301209 ./net-analyzer/zabbix/zabbix-4.4.8.ebuild
 2005121139 ./net-analyzer/zabbix/zabbix-3.0.31.ebuild
 2005121139 ./net-analyzer/zabbix/zabbix-4.0.20.ebuild
@@ -23431,7 +23446,7 @@
 2001151339 ./net-dns/dnsdist/dnsdist-1.4.0.ebuild
 2001182109 ./net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
 2004032241 ./net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild
-2005121009 ./net-dns/dnsmasq/dnsmasq-2.81.ebuild
+2005140039 ./net-dns/dnsmasq/dnsmasq-2.81.ebuild
 1903151409 ./net-dns/dnssec-check/dnssec-check-2.2.ebuild
 2003261841 ./net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
 1911080209 ./net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
@@ -23605,10 +23620,10 @@
 2002060939 ./net-fs/s3fs/s3fs-1.86.ebuild
 2001051415 ./net-fs/s3ql/s3ql-2.33.ebuild
 2004032241 ./net-fs/samba/samba-4.11.6-r2.ebuild
-2005061039 ./net-fs/samba/samba-4.11.8.ebuild
 2005061009 ./net-fs/samba/samba-4.12.1.ebuild
 2005061539 ./net-fs/samba/samba-4.11.9.ebuild
 2005061539 ./net-fs/samba/samba-4.12.2.ebuild
+2005150039 ./net-fs/samba/samba-4.11.8.ebuild
 2003280339 ./net-fs/smbnetfs/smbnetfs-0.6.2.ebuild
 1808262039 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2004282139 ./net-fs/sshfs/sshfs-3.7.0.ebuild
@@ -23699,10 +23714,10 @@
 1807111209 ./net-im/ricochet/ricochet-1.1.4.ebuild
 1807111209 ./net-im/ricochet/ricochet-9999.ebuild
 1902221239 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
-2004291139 ./net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
+2005150239 ./net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
 2002110039 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2004161439 ./net-im/skypeforlinux/skypeforlinux-8.59.0.77.ebuild
-2004062139 ./net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+2005141209 ./net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
 2002112051 ./net-im/swift/swift-4.0.2-r1.ebuild
 2005042039 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild
 2005091439 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild
@@ -23719,11 +23734,12 @@
 2002021839 ./net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
 1702282250 ./net-im/ysm/ysm-2.9.9.1-r1.ebuild
 2004211209 ./net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild
-2004242309 ./net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
 2005020409 ./net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild
 2005060039 ./net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild
 2005090839 ./net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild
 2005100009 ./net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild
+2005141639 ./net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+2005142009 ./net-im/telegram-desktop/telegram-desktop-2.1.6.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2003240009 ./net-im/teams/teams-1.3.00.958.ebuild
 2003281639 ./net-im/teams/teams-1.3.00.5153.ebuild
@@ -23927,7 +23943,7 @@
 1912171609 ./net-libs/libhtp/libhtp-0.5.32.ebuild
 1912110241 ./net-libs/libhubbub/libhubbub-0.3.3.ebuild
 1912110241 ./net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
-2005131809 ./net-libs/libhubbub/libhubbub-0.3.6.ebuild
+2005141109 ./net-libs/libhubbub/libhubbub-0.3.6.ebuild
 2005081846 ./net-libs/libident/libident-0.32-r1.ebuild
 1904111909 ./net-libs/libiio/libiio-0.15-r1.ebuild
 1904111909 ./net-libs/libiio/libiio-9999.ebuild
@@ -24076,7 +24092,7 @@
 1904220639 ./net-libs/libupnpp/libupnpp-0.17.0.ebuild
 2004032241 ./net-libs/libvncserver/libvncserver-0.9.12-r5.ebuild
 2001230639 ./net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
-2005121709 ./net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
+2005140039 ./net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
 2004122139 ./net-libs/libzapojit/libzapojit-0.0.3.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -24167,10 +24183,10 @@
 2001261339 ./net-libs/signond/signond-8.60-r1.ebuild
 2005091209 ./net-libs/socket_wrapper/socket_wrapper-1.2.3.ebuild
 2004032241 ./net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
-2004221139 ./net-libs/srt/srt-1.3.2-r1.ebuild
-2004221139 ./net-libs/srt/srt-1.4.0-r1.ebuild
-2004221139 ./net-libs/srt/srt-1.4.1-r1.ebuild
-2004221139 ./net-libs/srt/srt-9999.ebuild
+2005140039 ./net-libs/srt/srt-1.3.2-r1.ebuild
+2005140039 ./net-libs/srt/srt-1.4.0-r1.ebuild
+2005150039 ./net-libs/srt/srt-1.4.1-r1.ebuild
+2005140039 ./net-libs/srt/srt-9999.ebuild
 2002111539 ./net-libs/stem/stem-1.5.4.ebuild
 2002111539 ./net-libs/stem/stem-1.6.0.ebuild
 2002111539 ./net-libs/stem/stem-1.7.0.ebuild
@@ -24192,15 +24208,16 @@
 1903081539 ./net-libs/wandio/wandio-4.1.2.ebuild
 1905141009 ./net-libs/wandio/wandio-4.2.0.ebuild
 1912110241 ./net-libs/wandio/wandio-4.2.1.ebuild
+2005150709 ./net-libs/wandio/wandio-4.2.3_p1.ebuild
 2003122339 ./net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
 2004131939 ./net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
-2004191539 ./net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
-2005131639 ./net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+2005150039 ./net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 1912300239 ./net-libs/xrootd/xrootd-4.8.3.ebuild
 2001051415 ./net-libs/xrootd/xrootd-4.11.1.ebuild
 2005090009 ./net-libs/xrootd/xrootd-4.12.0.ebuild
+2005142009 ./net-libs/xrootd/xrootd-4.12.1.ebuild
 1912110241 ./net-libs/zeromq/zeromq-3.2.5.ebuild
 2004032241 ./net-libs/zeromq/zeromq-4.3.2.ebuild
 2005062039 ./net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -24376,8 +24393,6 @@
 1908061209 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
 2005061009 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
 1909101739 ./net-misc/asterisk/asterisk-11.25.3.ebuild
-2004211139 ./net-misc/asterisk/asterisk-13.32.0-r1.ebuild
-2004211139 ./net-misc/asterisk/asterisk-16.9.0.ebuild
 2005061009 ./net-misc/asterisk/asterisk-16.10.0.ebuild
 2005081846 ./net-misc/asterisk/asterisk-13.33.0.ebuild
 1702282250 ./net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
@@ -24443,6 +24458,7 @@
 1911191609 ./net-misc/cni-plugins/cni-plugins-0.8.3.ebuild
 2002112051 ./net-misc/cni-plugins/cni-plugins-0.8.4.ebuild
 2005042139 ./net-misc/cni-plugins/cni-plugins-0.8.5.ebuild
+2005140139 ./net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
 1712171839 ./net-misc/connect/connect-1.103.ebuild
 1906071509 ./net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
 1712161139 ./net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
@@ -24490,6 +24506,7 @@
 2004091739 ./net-misc/dropbox/dropbox-94.4.384.ebuild
 2004292209 ./net-misc/dropbox/dropbox-96.4.172.ebuild
 2005051639 ./net-misc/dropbox/dropbox-97.3.451.ebuild
+2005140139 ./net-misc/dropbox/dropbox-97.4.467.ebuild
 2005061739 ./net-misc/econnman/econnman-1.1-r1.ebuild
 2002230040 ./net-misc/efax/efax-0.9a-r4.ebuild
 2002230040 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -24500,7 +24517,7 @@
 2003282039 ./net-misc/ena-driver/ena-driver-2.2.3.ebuild
 2001020109 ./net-misc/endlessh/endlessh-1.0.ebuild
 2001020109 ./net-misc/endlessh/endlessh-9999.ebuild
-2005131439 ./net-misc/endlessh/endlessh-1.1.ebuild
+2005150039 ./net-misc/endlessh/endlessh-1.1.ebuild
 1702282250 ./net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild
 1702282250 ./net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild
 2003261841 ./net-misc/ethertypes/ethertypes-0.ebuild
@@ -24511,7 +24528,6 @@
 2003261841 ./net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
 1709301757 ./net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
 1808051739 ./net-misc/felix/felix-3.1.3.ebuild
-2004252209 ./net-misc/freerdp/freerdp-2.0.0-r1.ebuild
 2005102139 ./net-misc/freerdp/freerdp-9999.ebuild
 2005121909 ./net-misc/freerdp/freerdp-2.1.0.ebuild
 2005130609 ./net-misc/freerdp/freerdp-2.9999.ebuild
@@ -24629,10 +24645,8 @@
 2004280039 ./net-misc/lldpd/lldpd-1.0.5-r1.ebuild
 1912060109 ./net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
 2004221239 ./net-misc/megatools/megatools-1.10.3.ebuild
-2003261841 ./net-misc/memcached/memcached-1.6.2.ebuild
-2003290509 ./net-misc/memcached/memcached-1.6.3.ebuild
 2004032241 ./net-misc/memcached/memcached-1.5.22.ebuild
-2005060109 ./net-misc/memcached/memcached-1.6.5.ebuild
+2005141039 ./net-misc/memcached/memcached-1.6.6.ebuild
 1906041439 ./net-misc/mico/mico-2.3.13-r13.ebuild
 1906121439 ./net-misc/mico/mico-2.3.13-r14.ebuild
 1906041439 ./net-misc/mico/mico-9999.ebuild
@@ -24642,6 +24656,7 @@
 2004261539 ./net-misc/minidlna/minidlna-1.2.1-r1.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
 2004021039 ./net-misc/miniupnpd/miniupnpd-2.1.20200329.ebuild
+2005140939 ./net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
 2004032241 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
 1910261809 ./net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
 2004142009 ./net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -25106,6 +25121,7 @@
 2002222009 ./net-p2p/rtorrent/rtorrent-0.9.8.ebuild
 2004230939 ./net-p2p/syncthing/syncthing-1.3.4-r1.ebuild
 2004282239 ./net-p2p/syncthing/syncthing-1.4.2.ebuild
+2005142009 ./net-p2p/syncthing/syncthing-1.5.0.ebuild
 1805290208 ./net-p2p/syrep/syrep-0.9.ebuild
 2002111539 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
 2005091109 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -25153,6 +25169,7 @@
 1801272109 ./net-print/cnijfilter2/cnijfilter2-5.40.ebuild
 1812051039 ./net-print/cnijfilter2/cnijfilter2-5.50.ebuild
 1908271009 ./net-print/cnijfilter2/cnijfilter2-5.70.ebuild
+2005140039 ./net-print/cnijfilter2/cnijfilter2-5.80.ebuild
 1702282250 ./net-print/cups-bjnp/cups-bjnp-1.1.ebuild
 1702282250 ./net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
 1802061938 ./net-print/cups-bjnp/cups-bjnp-2.0.ebuild
@@ -25309,7 +25326,7 @@
 2004222009 ./net-vpn/openconnect/openconnect-8.06.ebuild
 2005011239 ./net-vpn/openconnect/openconnect-8.08.ebuild
 2005060409 ./net-vpn/openconnect/openconnect-9999.ebuild
-2005132039 ./net-vpn/openconnect/openconnect-8.09-r1.ebuild
+2005150039 ./net-vpn/openconnect/openconnect-8.09-r1.ebuild
 2003311139 ./net-vpn/openfortivpn/openfortivpn-1.13.2.ebuild
 2004291409 ./net-vpn/openfortivpn/openfortivpn-1.13.3.ebuild
 2003120339 ./net-vpn/openvpn/openvpn-9999.ebuild
@@ -25333,12 +25350,11 @@
 2003261841 ./net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
 2005070209 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20200506.ebuild
 2004280309 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
-2005110739 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200510.ebuild
+2005140339 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
 2002271709 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild
 2003251709 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.2.ebuild
-2003310609 ./net-vpn/tailscale/tailscale-0.97_p45.ebuild
-2004220439 ./net-vpn/tailscale/tailscale-0.98_p0.ebuild
-2005132039 ./net-vpn/ocserv/ocserv-1.0.1.ebuild
+2005140739 ./net-vpn/tailscale/tailscale-0.98_p0.ebuild
+2005150039 ./net-vpn/ocserv/ocserv-1.0.1.ebuild
 2004060609 ./net-vpn/mullvad-netns/mullvad-netns-9999.ebuild
 2004170509 ./net-vpn/mullvad-netns/mullvad-netns-0.2.ebuild
 2001280039 ./net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -25524,11 +25540,9 @@
 1912110241 ./net-wireless/uhd/uhd-3.14.1.1.ebuild
 2004102339 ./net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
 1910162109 ./net-wireless/unifi/unifi-5.6.42-r1.ebuild
-1912021739 ./net-wireless/unifi/unifi-5.12.35.ebuild
-2002252109 ./net-wireless/unifi/unifi-5.12.66.ebuild
-2004211809 ./net-wireless/unifi/unifi-5.13.18.ebuild
 2005061909 ./net-wireless/unifi/unifi-5.13.22.ebuild
-2005121639 ./net-wireless/unifi/unifi-5.12.72.ebuild
+2005151709 ./net-wireless/unifi/unifi-5.12.72.ebuild
+2005141539 ./net-wireless/unifi/unifi-5.13.26.ebuild
 2003251309 ./net-wireless/urh/urh-2.8.4.ebuild
 2003251309 ./net-wireless/urh/urh-9999.ebuild
 1702282250 ./net-wireless/wavemon/wavemon-0.7.6.ebuild
@@ -25952,7 +25966,7 @@
 1702282250 ./sci-biology/finchtv/finchtv-1.3.1-r2.ebuild
 1702282250 ./sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
 2003281009 ./sci-biology/foldingathome/foldingathome-7.5.1-r3.ebuild
-2004250039 ./sci-biology/foldingathome/foldingathome-7.6.9.ebuild
+2005141809 ./sci-biology/foldingathome/foldingathome-7.6.13.ebuild
 1702282250 ./sci-biology/gatk/gatk-2.4.ebuild
 1912110309 ./sci-biology/gibbs/gibbs-3.1.ebuild
 1805212239 ./sci-biology/glimmer/glimmer-3.02-r3.ebuild
@@ -26113,15 +26127,13 @@
 2002081939 ./sci-chemistry/gmxapi/gmxapi-0.0.7.1.ebuild
 1702282250 ./sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
 1801070009 ./sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild
-1910050109 ./sci-chemistry/gromacs/gromacs-2018.9999.ebuild
-2001012339 ./sci-chemistry/gromacs/gromacs-2018.8.ebuild
-2002092009 ./sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
-2002092009 ./sci-chemistry/gromacs/gromacs-2019.9999.ebuild
 2002092009 ./sci-chemistry/gromacs/gromacs-2020.9999.ebuild
 2002092009 ./sci-chemistry/gromacs/gromacs-9999.ebuild
-2002281939 ./sci-chemistry/gromacs/gromacs-2019.6.ebuild
 2005121709 ./sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild
 2005121709 ./sci-chemistry/gromacs/gromacs-2020.2.ebuild
+2005141709 ./sci-chemistry/gromacs/gromacs-2018.8.ebuild
+2005141709 ./sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
+2005141709 ./sci-chemistry/gromacs/gromacs-2019.6.ebuild
 2002122139 ./sci-chemistry/hollow/hollow-1.2-r1.ebuild
 1702282250 ./sci-chemistry/ksdssp/ksdssp-040728-r1.ebuild
 1702282250 ./sci-chemistry/mars/mars-1.2.ebuild
@@ -26257,42 +26269,35 @@
 1801270108 ./sci-electronics/iverilog/iverilog-10.2.ebuild
 2003261841 ./sci-electronics/iverilog/iverilog-10.3.ebuild
 2003261841 ./sci-electronics/iverilog/iverilog-9999.ebuild
-1901022009 ./sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild
 2001070009 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.0.ebuild
 2001070009 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.2.ebuild
 2001070009 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild
 2001070009 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild
-1901022009 ./sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild
 2001070009 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.0.ebuild
 2001070009 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.2.ebuild
 2001070009 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild
 2001070009 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild
-1901022009 ./sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild
 1904072009 ./sci-electronics/kicad-meta/kicad-meta-5.1.0.ebuild
 1906041609 ./sci-electronics/kicad-meta/kicad-meta-5.1.2.ebuild
 1908101439 ./sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild
 1912172139 ./sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild
-1901022009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild
 2001070009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.0.ebuild
 2001070009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.2.ebuild
 2001070009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild
 2001070009 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild
-1901022009 ./sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild
 2001070009 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.0.ebuild
 2001070009 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.2.ebuild
 2001070009 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild
 2001070009 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild
-1901022009 ./sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild
 2001070009 ./sci-electronics/kicad-templates/kicad-templates-5.1.0.ebuild
 2001070009 ./sci-electronics/kicad-templates/kicad-templates-5.1.2.ebuild
 2001070009 ./sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild
 2001070009 ./sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild
 2002092009 ./sci-electronics/kicad/kicad-4.0.7-r1.ebuild
-2002092009 ./sci-electronics/kicad/kicad-5.0.1.ebuild
-2002092009 ./sci-electronics/kicad/kicad-5.1.0-r1.ebuild
-2002092009 ./sci-electronics/kicad/kicad-5.1.2-r1.ebuild
-2002092009 ./sci-electronics/kicad/kicad-5.1.4.ebuild
-2005102109 ./sci-electronics/kicad/kicad-5.1.5-r1.ebuild
+2005141409 ./sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+2005141409 ./sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+2005141409 ./sci-electronics/kicad/kicad-5.1.4.ebuild
+2005141409 ./sci-electronics/kicad/kicad-5.1.5-r2.ebuild
 2004200009 ./sci-electronics/klayout/klayout-9999.ebuild
 2005070039 ./sci-electronics/klayout/klayout-0.26.4-r1.ebuild
 2005070039 ./sci-electronics/klayout/klayout-0.26.5.ebuild
@@ -27001,7 +27006,7 @@
 2002230040 ./sci-mathematics/prover9/prover9-2009.11a.ebuild
 1910300039 ./sci-mathematics/psmt2-frontend/psmt2-frontend-0.2.ebuild
 2002230040 ./sci-mathematics/pspp/pspp-1.2.0.ebuild
-2003162209 ./sci-mathematics/pymc3/pymc3-3.1.ebuild
+2005141409 ./sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
 2002170139 ./sci-mathematics/relational/relational-2.5-r2.ebuild
 2001240239 ./sci-mathematics/rkward/rkward-0.7.1.ebuild
 1912080309 ./sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
@@ -27031,6 +27036,7 @@
 1702282250 ./sci-mathematics/yafu/yafu-1.34.3.ebuild
 1702282250 ./sci-mathematics/yafu/yafu-9999.ebuild
 2003202239 ./sci-mathematics/z3/z3-4.8.6.ebuild
+2005140939 ./sci-mathematics/z3/z3-4.8.8.ebuild
 2002281539 ./sci-mathematics/gp2c/gp2c-0.0.11.2-r1.ebuild
 2003061709 ./sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
 2003251909 ./sci-mathematics/eclib/eclib-20190909.ebuild
@@ -28302,7 +28308,7 @@
 2004032241 ./sys-apps/mlocate/mlocate-0.26-r2.ebuild
 2004121939 ./sys-apps/mlocate/mlocate-0.26-r3.ebuild
 2004211009 ./sys-apps/modutils/modutils-2.4.27-r2.ebuild
-2005091709 ./sys-apps/moreutils/moreutils-0.63.ebuild
+2005140039 ./sys-apps/moreutils/moreutils-0.63.ebuild
 1910111911 ./sys-apps/most/most-5.1.0.ebuild
 2002112051 ./sys-apps/most/most-5.0.0a-r1.ebuild
 1702282250 ./sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
@@ -28584,6 +28590,7 @@
 2004112309 ./sys-auth/google-authenticator/google-authenticator-9999.ebuild
 2001131309 ./sys-auth/keystone/keystone-16.0.0.ebuild
 2001270216 ./sys-auth/keystone/keystone-2019.2.9999.ebuild
+2005140209 ./sys-auth/keystone/keystone-16.0.1.ebuild
 1909131639 ./sys-auth/libfprint/libfprint-1.0.ebuild
 1912271639 ./sys-auth/libfprint/libfprint-1.90.0.ebuild
 2003191309 ./sys-auth/libfprint/libfprint-1.90.1.ebuild
@@ -28937,18 +28944,21 @@
 2003180109 ./sys-cluster/kube-apiserver/kube-apiserver-1.15.11.ebuild
 2003191839 ./sys-cluster/kube-apiserver/kube-apiserver-1.16.8.ebuild
 2003200039 ./sys-cluster/kube-apiserver/kube-apiserver-1.17.4.ebuild
+2005141909 ./sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild
 2002190239 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild
 2002190109 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.3.ebuild
 2002252209 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild
 2003180109 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.15.11.ebuild
 2003191839 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.16.8.ebuild
 2003200039 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.4.ebuild
+2005141909 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.15.12.ebuild
 2002190239 ./sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild
 2002190109 ./sys-cluster/kube-proxy/kube-proxy-1.17.3.ebuild
 2002252209 ./sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild
 2003180109 ./sys-cluster/kube-proxy/kube-proxy-1.15.11.ebuild
 2003191839 ./sys-cluster/kube-proxy/kube-proxy-1.16.8.ebuild
 2003200039 ./sys-cluster/kube-proxy/kube-proxy-1.17.4.ebuild
+2005141909 ./sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild
 2004291509 ./sys-cluster/kube-router/kube-router-0.3.1.ebuild
 2004291509 ./sys-cluster/kube-router/kube-router-0.4.0.ebuild
 2002190239 ./sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild
@@ -28957,24 +28967,28 @@
 2003180109 ./sys-cluster/kube-scheduler/kube-scheduler-1.15.11.ebuild
 2003191839 ./sys-cluster/kube-scheduler/kube-scheduler-1.16.8.ebuild
 2003200039 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.4.ebuild
+2005141909 ./sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild
 2002190239 ./sys-cluster/kubeadm/kubeadm-1.16.7.ebuild
 2002190109 ./sys-cluster/kubeadm/kubeadm-1.17.3.ebuild
 2002252209 ./sys-cluster/kubeadm/kubeadm-1.15.10.ebuild
 2003180109 ./sys-cluster/kubeadm/kubeadm-1.15.11.ebuild
 2003191839 ./sys-cluster/kubeadm/kubeadm-1.16.8.ebuild
 2003200039 ./sys-cluster/kubeadm/kubeadm-1.17.4.ebuild
+2005141909 ./sys-cluster/kubeadm/kubeadm-1.15.12.ebuild
 2002190239 ./sys-cluster/kubectl/kubectl-1.16.7.ebuild
 2002190109 ./sys-cluster/kubectl/kubectl-1.17.3.ebuild
 2002252209 ./sys-cluster/kubectl/kubectl-1.15.10.ebuild
 2003191839 ./sys-cluster/kubectl/kubectl-1.16.8.ebuild
 2003200039 ./sys-cluster/kubectl/kubectl-1.17.4.ebuild
 2004092009 ./sys-cluster/kubectl/kubectl-1.15.11.ebuild
+2005141909 ./sys-cluster/kubectl/kubectl-1.15.12.ebuild
 2002190239 ./sys-cluster/kubelet/kubelet-1.16.7.ebuild
 2002190109 ./sys-cluster/kubelet/kubelet-1.17.3.ebuild
 2002252209 ./sys-cluster/kubelet/kubelet-1.15.10.ebuild
 2003180109 ./sys-cluster/kubelet/kubelet-1.15.11.ebuild
 2003191839 ./sys-cluster/kubelet/kubelet-1.16.8.ebuild
 2003200039 ./sys-cluster/kubelet/kubelet-1.17.4.ebuild
+2005141909 ./sys-cluster/kubelet/kubelet-1.15.12.ebuild
 1903190209 ./sys-cluster/legion/legion-16.08.0-r1.ebuild
 1903190209 ./sys-cluster/legion/legion-16.10.0.ebuild
 1903190209 ./sys-cluster/legion/legion-17.02.0.ebuild
@@ -29001,6 +29015,7 @@
 1912111540 ./sys-cluster/maui/maui-3.3.1-r3.ebuild
 2002101639 ./sys-cluster/minikube/minikube-1.6.1.ebuild
 2002101639 ./sys-cluster/minikube/minikube-1.6.2.ebuild
+2005140139 ./sys-cluster/minikube/minikube-1.10.1.ebuild
 1702282250 ./sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
 1809211709 ./sys-cluster/mpich/mpich-3.0.4.ebuild
 2002231739 ./sys-cluster/mpich/mpich-3.3.ebuild
@@ -29052,10 +29067,7 @@
 2004090009 ./sys-cluster/sanlock/sanlock-3.8.0.ebuild
 2004241739 ./sys-cluster/singularity/singularity-3.5.3-r1.ebuild
 2005072109 ./sys-cluster/singularity/singularity-2.6.1.ebuild
-2002231739 ./sys-cluster/slurm/slurm-19.05.4.1.ebuild
-2002231739 ./sys-cluster/slurm/slurm-19.05.5.1.ebuild
-2003271639 ./sys-cluster/slurm/slurm-20.02.0.1.ebuild
-2003271639 ./sys-cluster/slurm/slurm-20.02.1.1.ebuild
+2005141739 ./sys-cluster/slurm/slurm-20.02.2.1.ebuild
 1911131809 ./sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
 2004161139 ./sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
 2005082323 ./sys-cluster/swift/swift-2.23.1-r2.ebuild
@@ -29149,7 +29161,7 @@
 2004211009 ./sys-devel/bison/bison-3.1.ebuild
 2005090409 ./sys-devel/bison/bison-3.6.ebuild
 2005110139 ./sys-devel/bison/bison-3.6.1.ebuild
-2001282139 ./sys-devel/bmake/bmake-20181221.ebuild
+2005151239 ./sys-devel/bmake/bmake-20200318.ebuild
 2004032241 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
 1911031509 ./sys-devel/clang-common/clang-common-10.0.0.9999.ebuild
 1910111911 ./sys-devel/clang-common/clang-common-8.0.1.ebuild
@@ -29445,7 +29457,7 @@
 2004032241 ./sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
 2004080939 ./sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
 2004092109 ./sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
-2005011639 ./sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+2005151709 ./sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
 1805181539 ./sys-fs/ctmg/ctmg-1.2.ebuild
 1807260709 ./sys-fs/davl/davl-1.2.4-r2.ebuild
 2005032310 ./sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
@@ -29535,6 +29547,7 @@
 2004222009 ./sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
 2004270410 ./sys-fs/lvm2/lvm2-2.03.09.ebuild
 1904020709 ./sys-fs/lxcfs/lxcfs-3.0.3.ebuild
+2005151709 ./sys-fs/lxcfs/lxcfs-4.0.3.ebuild
 1906221309 ./sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
 2004032241 ./sys-fs/mdadm/mdadm-4.1.ebuild
 1905131109 ./sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
@@ -29591,7 +29604,7 @@
 1912110241 ./sys-fs/tmsu/tmsu-0.7.0.ebuild
 2001032239 ./sys-fs/tmsu/tmsu-0.7.4.ebuild
 2002092009 ./sys-fs/traydevice/traydevice-1.6.2-r2.ebuild
-1810081509 ./sys-fs/treesize/treesize-0.54.1-r1.ebuild
+2005151009 ./sys-fs/treesize/treesize-0.54.1-r1.ebuild
 2003261841 ./sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
 2004032241 ./sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
 2003261841 ./sys-fs/udev/udev-243.ebuild
@@ -29626,8 +29639,8 @@
 1912070409 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
 1905161539 ./sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild
 2003310039 ./sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild
-2005060609 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
-2005130209 ./sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+2005150709 ./sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+2005150709 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
 2002101539 ./sys-fs/zfs/zfs-0.7.13-r1.ebuild
 2002101539 ./sys-fs/zfs/zfs-0.7.13-r2.ebuild
 2003310039 ./sys-fs/zfs/zfs-0.8.3-r1.ebuild
@@ -29707,6 +29720,9 @@
 2005120439 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.223.ebuild
 2005120439 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.40.ebuild
 2005120439 ./sys-kernel/gentoo-sources/gentoo-sources-5.6.12.ebuild
+2005141639 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.123.ebuild
+2005141639 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.41.ebuild
+2005141639 ./sys-kernel/gentoo-sources/gentoo-sources-5.6.13.ebuild
 2004130109 ./sys-kernel/git-sources/git-sources-5.7_rc1.ebuild
 2004200139 ./sys-kernel/git-sources/git-sources-5.7_rc2.ebuild
 2004270209 ./sys-kernel/git-sources/git-sources-5.7_rc3.ebuild
@@ -29749,32 +29765,33 @@
 2004212009 ./sys-kernel/pf-sources/pf-sources-5.6_p4.ebuild
 2004271809 ./sys-kernel/pf-sources/pf-sources-5.6_p5.ebuild
 2005040739 ./sys-kernel/pf-sources/pf-sources-5.6_p6.ebuild
+2005150839 ./sys-kernel/pf-sources/pf-sources-5.6_p7.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1907152339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
 1912050239 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-4.19.9999.ebuild
 1912050239 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.9999.ebuild
-2001302209 ./sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild
-2005101239 ./sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild
+2005151809 ./sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild
 2002101539 ./sys-kernel/spl/spl-0.7.13.ebuild
 2004181639 ./sys-kernel/vanilla-sources/vanilla-sources-5.5.18.ebuild
 2004290939 ./sys-kernel/vanilla-sources/vanilla-sources-3.16.83.ebuild
 2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.180.ebuild
-2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.122.ebuild
 2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.223.ebuild
 2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.223.ebuild
-2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.40.ebuild
-2005101339 ./sys-kernel/vanilla-sources/vanilla-sources-5.6.12.ebuild
+2005141239 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.123.ebuild
+2005141239 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.41.ebuild
+2005141239 ./sys-kernel/vanilla-sources/vanilla-sources-5.6.13.ebuild
 1907151840 ./sys-kernel/xbox-sources/xbox-sources-2.6.16.26.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
@@ -29863,7 +29880,7 @@
 2005031409 ./sys-libs/glibc/glibc-2.31-r2.ebuild
 2005120009 ./sys-libs/glibc/glibc-2.30-r8.ebuild
 2005130009 ./sys-libs/glibc/glibc-2.31-r3.ebuild
-2005130009 ./sys-libs/glibc/glibc-9999.ebuild
+2005141509 ./sys-libs/glibc/glibc-9999.ebuild
 2004211009 ./sys-libs/gpm/gpm-1.20.7-r2.ebuild
 1806232139 ./sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild
 1910131509 ./sys-libs/gwenhywfar/gwenhywfar-4.20.2-r1.ebuild
@@ -29873,7 +29890,7 @@
 2003282109 ./sys-libs/ldb/ldb-2.1.1.ebuild
 2004032241 ./sys-libs/ldb/ldb-2.0.8.ebuild
 2004291309 ./sys-libs/ldb/ldb-2.1.2.ebuild
-2005061039 ./sys-libs/ldb/ldb-2.0.10.ebuild
+2005150039 ./sys-libs/ldb/ldb-2.0.10.ebuild
 1907181903 ./sys-libs/libaal/libaal-1.0.6.ebuild
 1907181903 ./sys-libs/libaal/libaal-1.0.7.ebuild
 2001061409 ./sys-libs/libaal/libaal-1.0.7-r1.ebuild
@@ -30271,7 +30288,7 @@
 2005110709 ./virtual/notification-daemon/notification-daemon-0.ebuild
 1703291854 ./virtual/ooo/ooo-0.ebuild
 2004020039 ./virtual/opencl/opencl-2.ebuild
-2005121609 ./virtual/opencl/opencl-3-r1.ebuild
+2005150039 ./virtual/opencl/opencl-3-r1.ebuild
 2004032241 ./virtual/opengl/opengl-7.0-r2.ebuild
 2004020039 ./virtual/os-headers/os-headers-0-r2.ebuild
 2005062039 ./virtual/os-headers/os-headers-0.ebuild
@@ -30438,9 +30455,10 @@
 1712020139 ./www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
 1804142309 ./www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild
 1901241209 ./www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild
-1810151709 ./www-apache/mod_h2/mod_h2-9999.ebuild
 2003021739 ./www-apache/mod_h2/mod_h2-1.15.7.ebuild
 2004171609 ./www-apache/mod_h2/mod_h2-1.15.8.ebuild
+2005151639 ./www-apache/mod_h2/mod_h2-1.15.9.ebuild
+2005151639 ./www-apache/mod_h2/mod_h2-9999.ebuild
 1708062000 ./www-apache/mod_jk/mod_jk-1.2.42.ebuild
 1804132139 ./www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
 1903092239 ./www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild
@@ -30677,13 +30695,9 @@
 1702282250 ./www-client/netrik/netrik-1.16.1-r1.ebuild
 1909231139 ./www-client/netsurf/netsurf-3.8-r2.ebuild
 1912100939 ./www-client/netsurf/netsurf-3.9.ebuild
-2004201739 ./www-client/opera-beta/opera-beta-68.0.3618.45.ebuild
-2004281409 ./www-client/opera-beta/opera-beta-68.0.3618.55.ebuild
-2004281409 ./www-client/opera-developer/opera-developer-69.0.3673.0.ebuild
-2005041639 ./www-client/opera-developer/opera-developer-69.0.3679.0.ebuild
+2005141639 ./www-client/opera-beta/opera-beta-69.0.3686.2.ebuild
 2005111709 ./www-client/opera-developer/opera-developer-69.0.3686.0.ebuild
-2005061209 ./www-client/opera/opera-68.0.3618.63-r1.ebuild
-2005131939 ./www-client/opera/opera-68.0.3618.104.ebuild
+2005141639 ./www-client/opera/opera-68.0.3618.104.ebuild
 1906080009 ./www-client/otter/otter-1.0.01.ebuild
 1904291109 ./www-client/otter/otter-9999.ebuild
 2001051415 ./www-client/pybugz/pybugz-9999.ebuild
@@ -30710,7 +30724,7 @@
 1912131639 ./www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
 2005122339 ./www-misc/awstats/awstats-7.4.ebuild
 2005131309 ./www-misc/awstats/awstats-7.8-r1.ebuild
-2005132039 ./www-misc/awstats/awstats-7.8.ebuild
+2005150039 ./www-misc/awstats/awstats-7.8.ebuild
 2002230040 ./www-misc/bookmarksync/bookmarksync-0.3.4-r3.ebuild
 2004051039 ./www-misc/buku/buku-4.3.ebuild
 1707301222 ./www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
@@ -30798,7 +30812,6 @@
 2002230040 ./www-servers/thttpd/thttpd-2.27.1.ebuild
 2002230040 ./www-servers/thttpd/thttpd-9999.ebuild
 2004101109 ./www-servers/tomcat/tomcat-9.0.34.ebuild
-2004192139 ./www-servers/tomcat/tomcat-8.5.53.ebuild
 2004201339 ./www-servers/tomcat/tomcat-7.0.103.ebuild
 2005121609 ./www-servers/tomcat/tomcat-8.5.54.ebuild
 2005131139 ./www-servers/tomcat/tomcat-8.5.55.ebuild
@@ -30806,7 +30819,7 @@
 2003261841 ./www-servers/tornado/tornado-6.0.3.ebuild
 2004032241 ./www-servers/tornado/tornado-4.5.3.ebuild
 2004111839 ./www-servers/tornado/tornado-5.1-r1.ebuild
-2005031609 ./www-servers/tornado/tornado-6.0.4.ebuild
+2005140209 ./www-servers/tornado/tornado-6.0.4.ebuild
 2005112009 ./www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
 2005112009 ./www-servers/uwsgi/uwsgi-2.0.17.ebuild
 2005112009 ./www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -30932,7 +30945,6 @@
 2004032241 ./x11-apps/xwd/xwd-1.0.7.ebuild
 2004032241 ./x11-apps/xwininfo/xwininfo-1.1.5.ebuild
 2004032241 ./x11-apps/xwud/xwud-1.0.5.ebuild
-2004032241 ./x11-base/xcb-proto/xcb-proto-1.13.ebuild
 2004202009 ./x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
 2005031239 ./x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
 2005031239 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -31109,13 +31121,13 @@
 2001220909 ./x11-libs/libva/libva-2.6.1.ebuild
 2001220909 ./x11-libs/libva/libva-9999.ebuild
 2005071739 ./x11-libs/libva/libva-2.7.0.ebuild
+2005141539 ./x11-libs/libva/libva-2.7.1.ebuild
 1903010139 ./x11-libs/libvdpau/libvdpau-99999.ebuild
 2001021409 ./x11-libs/libvdpau/libvdpau-1.3.ebuild
 2002231739 ./x11-libs/libvdpau/libvdpau-1.2.ebuild
 2004132310 ./x11-libs/libvdpau/libvdpau-1.4.ebuild
 2004032241 ./x11-libs/libwnck/libwnck-2.31.0.ebuild
 2004032241 ./x11-libs/libwnck/libwnck-3.30.0.ebuild
-2004032241 ./x11-libs/libxcb/libxcb-1.13.1.ebuild
 2004202009 ./x11-libs/libxcb/libxcb-1.14.ebuild
 2004032241 ./x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
 2004032241 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -31427,7 +31439,7 @@
 2001051839 ./x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
 2001131209 ./x11-misc/sxhkd/sxhkd-0.6.1.ebuild
 2002230040 ./x11-misc/synergy/synergy-1.9.1.ebuild
-2002230040 ./x11-misc/synergy/synergy-2.0.0.ebuild
+2005150139 ./x11-misc/synergy/synergy-2.0.0.ebuild
 1805220439 ./x11-misc/tabbed/tabbed-0.6.ebuild
 1812260009 ./x11-misc/tint2/tint2-16.2.ebuild
 1812252339 ./x11-misc/tint2/tint2-16.6.1.ebuild
@@ -31455,7 +31467,7 @@
 1702282250 ./x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
 1912312209 ./x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
 1912312209 ./x11-misc/virtualgl/virtualgl-9999.ebuild
-1911092309 ./x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+2005150139 ./x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
 1912310209 ./x11-misc/vym/vym-2.7.1.ebuild
 1912310209 ./x11-misc/vym/vym-9999.ebuild
 1805220439 ./x11-misc/wayv/wayv-0.3-r2.ebuild
@@ -31487,7 +31499,7 @@
 1910111911 ./x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
 2002141109 ./x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
 2004032241 ./x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
-2002112051 ./x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+2005150139 ./x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
 2002112051 ./x11-misc/xcalib/xcalib-0.10.ebuild
 1702282250 ./x11-misc/xcape/xcape-1.1.ebuild
 1710032209 ./x11-misc/xcape/xcape-1.2.ebuild
@@ -31510,7 +31522,7 @@
 1911180139 ./x11-misc/xdo/xdo-0.5.7.ebuild
 1702282250 ./x11-misc/xdock/xdock-0.3.0.ebuild
 1906130809 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
-2002112051 ./x11-misc/xearth/xearth-1.1-r1.ebuild
+2005150139 ./x11-misc/xearth/xearth-1.1-r1.ebuild
 1809221609 ./x11-misc/xfe/xfe-1.43.1.ebuild
 1906121039 ./x11-misc/xfe/xfe-1.43.2.ebuild
 1912281909 ./x11-misc/xfe/xfe-1.42.ebuild
@@ -31954,7 +31966,7 @@
 2002101309 ./x11-themes/greybird/greybird-9999.ebuild
 1712192239 ./x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
 2004032241 ./x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
-1912241509 ./x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+2005150139 ./x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
 1912241509 ./x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
 1912241509 ./x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
 1910111911 ./x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r3.ebuild
@@ -31964,14 +31976,14 @@
 1704141038 ./x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2.ebuild
 2002081939 ./x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
 2002222009 ./x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.ebuild
-1912241509 ./x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
+2005150139 ./x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
 1702282250 ./x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109.ebuild
 2002151310 ./x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20121212.ebuild
 2004032241 ./x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
 2004032241 ./x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
 1910200109 ./x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
 2004032241 ./x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
-1912241509 ./x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild
+2005150139 ./x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild
 2002230040 ./x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
 1901021509 ./x11-themes/icewm-extra-themes/icewm-extra-themes-1.1.ebuild
 1910171509 ./x11-themes/icewm-extra-themes/icewm-extra-themes-1.2.ebuild
@@ -32044,7 +32056,7 @@
 2004032241 ./x11-themes/sound-theme-freedesktop/sound-theme-freedesktop-0.8.ebuild
 1912241509 ./x11-themes/tactile/tactile-0_pre20060612.ebuild
 1912241509 ./x11-themes/tactile3/tactile3-3.1.ebuild
-1912241509 ./x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+2005150139 ./x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
 1912241509 ./x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
 2004032241 ./x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
 1803190338 ./x11-themes/terminology-themes/terminology-themes-0_p20180106.ebuild
@@ -32155,7 +32167,8 @@
 1912210209 ./x11-wm/ratpoison/ratpoison-9999.ebuild
 2004062109 ./x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
 2004062109 ./x11-wm/ratpoison/ratpoison-1.4.9.ebuild
-2004032241 ./x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+2005151009 ./x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+2005151009 ./x11-wm/sawfish/sawfish-1.12.90.ebuild
 1910111911 ./x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
 1912242109 ./x11-wm/sithwm/sithwm-1.2.3.ebuild
 1802221208 ./x11-wm/spectrwm/spectrwm-3.1.0.ebuild
@@ -32477,8 +32490,9 @@
 2005070039 metadata/md5-cache/acct-group/tsm-0
 2005090739 metadata/md5-cache/acct-group/bareos-0
 2005111739 metadata/md5-cache/acct-group/spamd-0
-2005122139 metadata/md5-cache/acct-group/Manifest.gz
 2005122139 metadata/md5-cache/acct-group/buildbot-0
+2005141009 metadata/md5-cache/acct-group/Manifest.gz
+2005141009 metadata/md5-cache/acct-group/lxd-0
 2003261939 metadata/md5-cache/acct-user/abrt-0
 2003261939 metadata/md5-cache/acct-user/alias-0
 2003261939 metadata/md5-cache/acct-user/amavis-0
@@ -32843,7 +32857,6 @@
 2003282328 metadata/md5-cache/app-admin/sxid-4.2-r2
 2003282328 metadata/md5-cache/app-admin/sysklogd-2.0.3
 2003282328 metadata/md5-cache/app-admin/sysklogd-2.1.1
-2003282328 metadata/md5-cache/app-admin/sysklogd-2.1.2
 2003282328 metadata/md5-cache/app-admin/sysklogd-9999
 2003282328 metadata/md5-cache/app-admin/sysrqd-17
 2003282328 metadata/md5-cache/app-admin/sysrqd-17-r1
@@ -33080,10 +33093,15 @@
 2005121139 metadata/md5-cache/app-admin/rex-1.10.0
 2005121139 metadata/md5-cache/app-admin/rex-9999
 2005122039 metadata/md5-cache/app-admin/sudo-1.9.0-r1
-2005132239 metadata/md5-cache/app-admin/Manifest.gz
 2005130839 metadata/md5-cache/app-admin/restart-services-0.15.1
-2005132239 metadata/md5-cache/app-admin/salt-2019.2.4
 2005132239 metadata/md5-cache/app-admin/salt-3000.2-r4
+2005151509 metadata/md5-cache/app-admin/Manifest.gz
+2005140039 metadata/md5-cache/app-admin/ansible-2.9.9
+2005141439 metadata/md5-cache/app-admin/gopass-1.9.2
+2005140239 metadata/md5-cache/app-admin/salt-2019.2.5
+2005140239 metadata/md5-cache/app-admin/salt-3000.3
+2005151509 metadata/md5-cache/app-admin/sysklogd-2.1.2
+2005141509 metadata/md5-cache/app-admin/terraform-0.12.25
 2004032241 metadata/md5-cache/app-antivirus/clamav-0.102.2-r1
 2004300915 metadata/md5-cache/app-antivirus/clamtk-6.02-r1
 2005011341 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0
@@ -33101,7 +33119,6 @@
 2003261841 metadata/md5-cache/app-arch/cpio-2.13
 2003282328 metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
 2003282328 metadata/md5-cache/app-arch/afio-2.5.1-r2
-2003282328 metadata/md5-cache/app-arch/arc-5.21p
 2003282328 metadata/md5-cache/app-arch/arj-3.10.22-r7
 2003282328 metadata/md5-cache/app-arch/bsdsfv-1.18-r2
 2003282328 metadata/md5-cache/app-arch/funzix-1.0
@@ -33231,9 +33248,10 @@
 2005102009 metadata/md5-cache/app-arch/pax-20161104
 2005101239 metadata/md5-cache/app-arch/zstd-1.4.4-r4
 2005121209 metadata/md5-cache/app-arch/rpm-4.14.2.1-r1
-2005132039 metadata/md5-cache/app-arch/Manifest.gz
 2005132039 metadata/md5-cache/app-arch/gcab-1.4
 2005131709 metadata/md5-cache/app-arch/upx-3.96
+2005151109 metadata/md5-cache/app-arch/Manifest.gz
+2005151109 metadata/md5-cache/app-arch/arc-5.21p
 1806240109 metadata/md5-cache/app-backup/ccollect-0.8
 1706110808 metadata/md5-cache/app-backup/cdbkup-1.0-r2
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
@@ -33308,9 +33326,6 @@
 2004171839 metadata/md5-cache/app-backup/snapper-0.8.7
 2004300915 metadata/md5-cache/app-backup/backintime-1.2.1
 2004300915 metadata/md5-cache/app-backup/backintime-9999
-2004300915 metadata/md5-cache/app-backup/bareos-17.2.6
-2004300915 metadata/md5-cache/app-backup/bareos-17.2.7-r1
-2004300915 metadata/md5-cache/app-backup/bareos-18.2.6
 2004300915 metadata/md5-cache/app-backup/bup-0.29.2
 2005011341 metadata/md5-cache/app-backup/attic-0.16-r1
 2005011341 metadata/md5-cache/app-backup/attic-9999
@@ -33352,9 +33367,12 @@
 2005091209 metadata/md5-cache/app-backup/btrbk-9999
 2005102009 metadata/md5-cache/app-backup/amanda-3.3.9
 2005102009 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
-2005121409 metadata/md5-cache/app-backup/Manifest.gz
 2005121009 metadata/md5-cache/app-backup/duplicity-0.8.12.1612-r1
 2005121409 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
+2005140739 metadata/md5-cache/app-backup/Manifest.gz
+2005140739 metadata/md5-cache/app-backup/bareos-17.2.9
+2005140739 metadata/md5-cache/app-backup/bareos-18.2.8
+2005140739 metadata/md5-cache/app-backup/bareos-19.2.7
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -33458,8 +33476,9 @@
 2004300915 metadata/md5-cache/app-cdr/cdemu-3.2.4
 2004300915 metadata/md5-cache/app-cdr/gcdemu-3.2.4
 2005011341 metadata/md5-cache/app-cdr/sync2cd-1.3-r1
-2005082039 metadata/md5-cache/app-cdr/Manifest.gz
 2005082039 metadata/md5-cache/app-cdr/bchunk-1.2.2
+2005151039 metadata/md5-cache/app-cdr/Manifest.gz
+2005151039 metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
 1910090839 metadata/md5-cache/app-crypt/acme-sh-2.8.3
 1809280333 metadata/md5-cache/app-crypt/asedriveiiie-serial-3.5
 1809280333 metadata/md5-cache/app-crypt/asedriveiiie-usb-3.5
@@ -34203,7 +34222,6 @@
 2003282328 metadata/md5-cache/app-editors/notepadqq-9999
 2003282328 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
 2003282328 metadata/md5-cache/app-editors/scite-4.2.1
-2003282328 metadata/md5-cache/app-editors/shed-1.15
 2003282328 metadata/md5-cache/app-editors/tea-47.0.0
 2003282328 metadata/md5-cache/app-editors/teco-36_p19940820
 2003282328 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
@@ -34308,8 +34326,9 @@
 2005102009 metadata/md5-cache/app-editors/moe-1.10
 2005102009 metadata/md5-cache/app-editors/moe-1.9
 2005121209 metadata/md5-cache/app-editors/emacs-27.0.91
-2005131109 metadata/md5-cache/app-editors/Manifest.gz
 2005131109 metadata/md5-cache/app-editors/sandy-0.4-r1
+2005141809 metadata/md5-cache/app-editors/Manifest.gz
+2005141809 metadata/md5-cache/app-editors/shed-1.15
 2002221412 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2002221412 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2002221412 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -34597,7 +34616,6 @@
 1805121908 metadata/md5-cache/app-emulation/libspectrum-1.4.2
 1807071609 metadata/md5-cache/app-emulation/libspectrum-1.4.4
 1905191439 metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0
-1904281939 metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
 1907271310 metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
 1905112309 metadata/md5-cache/app-emulation/spice-html5-0.2.1
 1902072239 metadata/md5-cache/app-emulation/umoci-0.2.1
@@ -34864,10 +34882,14 @@
 2005102009 metadata/md5-cache/app-emulation/virtualbox-bin-6.1.6.137129
 2005100339 metadata/md5-cache/app-emulation/wine-staging-5.8
 2005100339 metadata/md5-cache/app-emulation/wine-vanilla-5.8
-2005120909 metadata/md5-cache/app-emulation/Manifest.gz
 2005112009 metadata/md5-cache/app-emulation/q4wine-1.3.12
 2005120909 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
 2005120909 metadata/md5-cache/app-emulation/virt-manager-9999
+2005151209 metadata/md5-cache/app-emulation/Manifest.gz
+2005150839 metadata/md5-cache/app-emulation/lxc-4.0.1
+2005150839 metadata/md5-cache/app-emulation/lxc-templates-3.0.4
+2005151209 metadata/md5-cache/app-emulation/lxd-4.0.1
+2005140909 metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -35152,7 +35174,6 @@
 2004301709 metadata/md5-cache/app-i18n/skk-jisyo-999999
 2004302209 metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
 2004302209 metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r6
-2005011341 metadata/md5-cache/app-i18n/transifex-client-0.12.4
 2005031409 metadata/md5-cache/app-i18n/pology-0.12-r2
 2005031409 metadata/md5-cache/app-i18n/pology-9999
 2005061609 metadata/md5-cache/app-i18n/unicode-cldr-37.0
@@ -35161,11 +35182,11 @@
 2005071639 metadata/md5-cache/app-i18n/nkf-2.1.4
 2005101239 metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.0
 2005101239 metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.2
-2005121739 metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1
-2005121739 metadata/md5-cache/app-i18n/ibus-anthy-1.5.11
-2005132039 metadata/md5-cache/app-i18n/Manifest.gz
 2005132039 metadata/md5-cache/app-i18n/skk-jisyo-201905
 2005131339 metadata/md5-cache/app-i18n/transifex-client-0.13.9
+2005150139 metadata/md5-cache/app-i18n/Manifest.gz
+2005141809 metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
+2005141809 metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2003282328 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2003282328 metadata/md5-cache/app-laptop/i8kutils-1.33-r1
@@ -35869,7 +35890,6 @@
 2004300915 metadata/md5-cache/app-office/libreoffice-6.3.4.2-r1
 2004300915 metadata/md5-cache/app-office/libreoffice-6.3.5.2
 2004300915 metadata/md5-cache/app-office/libreoffice-6.3.9999
-2004300915 metadata/md5-cache/app-office/libreoffice-6.4.3.2
 2004300915 metadata/md5-cache/app-office/libreoffice-6.4.9999
 2004300915 metadata/md5-cache/app-office/libreoffice-9999
 2004300915 metadata/md5-cache/app-office/libreoffice-bin-6.3.4.2-r1
@@ -35881,7 +35901,6 @@
 2004300915 metadata/md5-cache/app-office/scribus-9999
 2004300915 metadata/md5-cache/app-office/unoconv-0.8.2
 2004300915 metadata/md5-cache/app-office/unoconv-0.9
-2004300915 metadata/md5-cache/app-office/unoconv-0.9.0
 2004301839 metadata/md5-cache/app-office/dia-0.97.3-r1
 2005011341 metadata/md5-cache/app-office/gtg-0.3.1
 2005011341 metadata/md5-cache/app-office/taskcoach-1.4.6
@@ -35889,8 +35908,10 @@
 2005102009 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
 2005102009 metadata/md5-cache/app-office/wps-office-11.1.0.9080
 2005102009 metadata/md5-cache/app-office/wps-office-11.1.0.9126
-2005121009 metadata/md5-cache/app-office/Manifest.gz
 2005121009 metadata/md5-cache/app-office/gnucash-3.8b
+2005142339 metadata/md5-cache/app-office/Manifest.gz
+2005142339 metadata/md5-cache/app-office/libreoffice-6.4.3.2
+2005141639 metadata/md5-cache/app-office/unoconv-0.9.0
 2004020339 metadata/md5-cache/app-officeext/Manifest.gz
 2004020339 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2004020339 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -36010,7 +36031,6 @@
 2005011341 metadata/md5-cache/app-portage/metagen-0.7.2
 2005011341 metadata/md5-cache/app-portage/metagen-9999
 2005011341 metadata/md5-cache/app-portage/mirrorselect-2.2.3
-2005011341 metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
 2005011341 metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
 2005011341 metadata/md5-cache/app-portage/mirrorselect-9999
 2005011341 metadata/md5-cache/app-portage/nattka-9999
@@ -36028,7 +36048,6 @@
 2005021009 metadata/md5-cache/app-portage/nattka-0.2.4
 2005022009 metadata/md5-cache/app-portage/porticron-0.7.1
 2005051739 metadata/md5-cache/app-portage/nattka-0.2.5
-2005042139 metadata/md5-cache/app-portage/portage-utils-0.87
 2005041539 metadata/md5-cache/app-portage/tatt-0.7-r1
 2005060009 metadata/md5-cache/app-portage/ufed-0.96
 2005070939 metadata/md5-cache/app-portage/euses-2.6.0
@@ -36041,9 +36060,11 @@
 2005081846 metadata/md5-cache/app-portage/portpeek-2.1.27-r1
 2005081846 metadata/md5-cache/app-portage/repoman-2.3.22
 2005102339 metadata/md5-cache/app-portage/pram-9
-2005121009 metadata/md5-cache/app-portage/Manifest.gz
 2005121009 metadata/md5-cache/app-portage/elogviewer-3.0-r2
 2005121009 metadata/md5-cache/app-portage/overlint-0.5.3-r2
+2005151509 metadata/md5-cache/app-portage/Manifest.gz
+2005140139 metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+2005151509 metadata/md5-cache/app-portage/portage-utils-0.87
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1903190509 metadata/md5-cache/app-shells/posh-0.13.2
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
@@ -36191,7 +36212,6 @@
 2002230040 metadata/md5-cache/app-text/refbase-0.9.6_p20180223
 2002222009 metadata/md5-cache/app-text/robodoc-4.99.43
 2003071909 metadata/md5-cache/app-text/xapian-omega-1.4.15
-2003170109 metadata/md5-cache/app-text/libetonyek-0.1.9-r1
 2003251709 metadata/md5-cache/app-text/robodoc-4.99.43-r1
 2003261841 metadata/md5-cache/app-text/bdf2psf-1.155
 2003261841 metadata/md5-cache/app-text/lesspipe-1.83
@@ -36364,7 +36384,6 @@
 2003311822 metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
 2003311822 metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
 2003311822 metadata/md5-cache/app-text/pstotext-1.9-r4
-2003311822 metadata/md5-cache/app-text/recode-3.7_pre20140303
 2003311822 metadata/md5-cache/app-text/reed-5.4
 2003311822 metadata/md5-cache/app-text/sdcv-0.5.2
 2003311822 metadata/md5-cache/app-text/simple-fb2-reader-1.1.2
@@ -36395,7 +36414,6 @@
 2004032241 metadata/md5-cache/app-text/dictd-1.12.1-r2
 2004032241 metadata/md5-cache/app-text/djvu-3.5.27-r1
 2004032241 metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
-2004032241 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
 2004032241 metadata/md5-cache/app-text/dos2unix-7.3.5
 2004032241 metadata/md5-cache/app-text/dvipng-1.15-r1
 2004032241 metadata/md5-cache/app-text/dvisvgm-2.1.3
@@ -36535,7 +36553,6 @@
 2004300915 metadata/md5-cache/app-text/pdf2djvu-0.9.12
 2004300915 metadata/md5-cache/app-text/pdf2djvu-0.9.15
 2004300915 metadata/md5-cache/app-text/pdf2djvu-0.9.8
-2004291509 metadata/md5-cache/app-text/poppler-0.88.0
 2004291509 metadata/md5-cache/app-text/poppler-9999
 2004300915 metadata/md5-cache/app-text/q-text-as-data-1.5.0
 2004300915 metadata/md5-cache/app-text/queequeg-0.91-r2
@@ -36641,9 +36658,14 @@
 2005102339 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2005102339 metadata/md5-cache/app-text/zathura-ps-9999
 2005121709 metadata/md5-cache/app-text/hyperestraier-1.4.13
-2005132039 metadata/md5-cache/app-text/Manifest.gz
 2005132039 metadata/md5-cache/app-text/gtkspell-2.0.16-r1
 2005131939 metadata/md5-cache/app-text/pastebinit-1.5.1
+2005151339 metadata/md5-cache/app-text/Manifest.gz
+2005151139 metadata/md5-cache/app-text/calibre-4.16.0
+2005140039 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+2005142339 metadata/md5-cache/app-text/libetonyek-0.1.9-r1
+2005142039 metadata/md5-cache/app-text/poppler-0.88.0-r1
+2005151339 metadata/md5-cache/app-text/recode-3.7.6
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -37297,7 +37319,6 @@
 2004020310 metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2
 2004020310 metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
 2004020310 metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
-2004020310 metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
 2004020310 metadata/md5-cache/dev-cpp/rttr-0.9.6
 2004020310 metadata/md5-cache/dev-cpp/waylandpp-0.2.4
 2004020310 metadata/md5-cache/dev-cpp/waylandpp-0.2.5
@@ -37350,9 +37371,10 @@
 2005071939 metadata/md5-cache/dev-cpp/libxmlpp-3.0.1
 2005102339 metadata/md5-cache/dev-cpp/glibmm-2.64.2
 2005102339 metadata/md5-cache/dev-cpp/mm-common-1.0.0
-2005132039 metadata/md5-cache/dev-cpp/Manifest.gz
 2005132039 metadata/md5-cache/dev-cpp/glibmm-2.62.0
 2005131609 metadata/md5-cache/dev-cpp/kokkos-3.1.01
+2005150339 metadata/md5-cache/dev-cpp/Manifest.gz
+2005150339 metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.11.1
 1910170740 metadata/md5-cache/dev-db/innotop-1.11.4
@@ -37393,8 +37415,6 @@
 2002261340 metadata/md5-cache/dev-db/pgbouncer-1.11.0
 2002261340 metadata/md5-cache/dev-db/pgbouncer-1.12.0
 2002261340 metadata/md5-cache/dev-db/pgbouncer-1.9.0
-2002261340 metadata/md5-cache/dev-db/pgtap-0.99.0
-2002261340 metadata/md5-cache/dev-db/plr-8.3.0.17
 2003201209 metadata/md5-cache/dev-db/pspg-2.6.6
 2003241839 metadata/md5-cache/dev-db/phpmyadmin-5.0.2
 2003261841 metadata/md5-cache/dev-db/m17n-db-1.8.0
@@ -37429,12 +37449,6 @@
 2003282328 metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
 2003282328 metadata/md5-cache/dev-db/pgagent-4.0.0
 2003282328 metadata/md5-cache/dev-db/pgagent-4.0.0-r1
-2003282328 metadata/md5-cache/dev-db/pgpool2-3.7.10
-2003282328 metadata/md5-cache/dev-db/pgpool2-4.0.5
-2003282328 metadata/md5-cache/dev-db/pgpool2-9999
-2003282328 metadata/md5-cache/dev-db/postgis-2.5.3-r1
-2003282328 metadata/md5-cache/dev-db/postgis-3.0.0-r1
-2003282328 metadata/md5-cache/dev-db/postgis-9999
 2003282328 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.1_p20191025-r1
 2003282328 metadata/md5-cache/dev-db/redis-4.0.14
 2003282328 metadata/md5-cache/dev-db/redis-5.0.5
@@ -37492,13 +37506,9 @@
 2003311822 metadata/md5-cache/dev-db/percona-server-8.0.18.9
 2003311822 metadata/md5-cache/dev-db/pg_top-3.7.0
 2003311822 metadata/md5-cache/dev-db/pgagent-3.4.0-r3
-2003311822 metadata/md5-cache/dev-db/pgmodeler-0.9.1
-2003311822 metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
 2003311822 metadata/md5-cache/dev-db/redis-4.0.2-r1
 2003311822 metadata/md5-cache/dev-db/repmgr-3.0.1
 2003311822 metadata/md5-cache/dev-db/repmgr-3.3.2
-2003311822 metadata/md5-cache/dev-db/slony1-2.2.6
-2003311822 metadata/md5-cache/dev-db/slony1-2.2.7
 2003311822 metadata/md5-cache/dev-db/spatialite-4.3.0a
 2003311822 metadata/md5-cache/dev-db/sqlcipher-3.4.2
 2003311822 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
@@ -37575,8 +37585,6 @@
 2004300915 metadata/md5-cache/dev-db/postgresql-10.12
 2004300915 metadata/md5-cache/dev-db/postgresql-11.7
 2004300915 metadata/md5-cache/dev-db/postgresql-12.2
-2004300915 metadata/md5-cache/dev-db/postgresql-9.6.17
-2004300915 metadata/md5-cache/dev-db/postgresql-9999
 2004300915 metadata/md5-cache/dev-db/tokumx-1.5.0-r2
 2004300915 metadata/md5-cache/dev-db/tokumx-2.0.2-r2
 2005011341 metadata/md5-cache/dev-db/SchemaSync-0.9.2-r1
@@ -37593,8 +37601,6 @@
 2005011341 metadata/md5-cache/dev-db/sadisplay-0.4.9
 2005031839 metadata/md5-cache/dev-db/mysql-5.7.29
 2005041909 metadata/md5-cache/dev-db/percona-server-8.0.19.10
-2005060009 metadata/md5-cache/dev-db/postgresql-9.4.26
-2005060009 metadata/md5-cache/dev-db/postgresql-9.5.21
 2005090009 metadata/md5-cache/dev-db/mariadb-10.1.44-r1
 2005090009 metadata/md5-cache/dev-db/mariadb-10.2.31-r1
 2005090009 metadata/md5-cache/dev-db/mariadb-10.3.22-r1
@@ -37602,13 +37608,35 @@
 2005071639 metadata/md5-cache/dev-db/pgxnclient-1.2.1
 2005102009 metadata/md5-cache/dev-db/bucardo-5.4.1
 2005102009 metadata/md5-cache/dev-db/mtop-0.6.6-r3
-2005101339 metadata/md5-cache/dev-db/mysql-5.7.30
-2005101339 metadata/md5-cache/dev-db/mysql-8.0.20
 2005102009 metadata/md5-cache/dev-db/mytop-1.6-r4
 2005101309 metadata/md5-cache/dev-db/qdbm-1.8.78-r2
 2005111839 metadata/md5-cache/dev-db/mongodb-4.2.3-r1
-2005131509 metadata/md5-cache/dev-db/Manifest.gz
 2005130239 metadata/md5-cache/dev-db/rqlite-5.2.0
+2005151639 metadata/md5-cache/dev-db/Manifest.gz
+2005150039 metadata/md5-cache/dev-db/mysql-5.7.30
+2005150039 metadata/md5-cache/dev-db/mysql-8.0.20
+2005151639 metadata/md5-cache/dev-db/pgmodeler-0.9.1
+2005151639 metadata/md5-cache/dev-db/pgpool2-3.7.10
+2005151639 metadata/md5-cache/dev-db/pgpool2-4.0.5
+2005151639 metadata/md5-cache/dev-db/pgpool2-9999
+2005151639 metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
+2005151639 metadata/md5-cache/dev-db/pgtap-0.99.0
+2005151639 metadata/md5-cache/dev-db/plr-8.3.0.17
+2005151639 metadata/md5-cache/dev-db/postgis-2.5.3-r1
+2005151639 metadata/md5-cache/dev-db/postgis-3.0.0-r1
+2005151639 metadata/md5-cache/dev-db/postgis-9999
+2005151639 metadata/md5-cache/dev-db/postgresql-10.13
+2005151639 metadata/md5-cache/dev-db/postgresql-11.8
+2005151639 metadata/md5-cache/dev-db/postgresql-12.3
+2005151639 metadata/md5-cache/dev-db/postgresql-9.4.26
+2005151639 metadata/md5-cache/dev-db/postgresql-9.5.21
+2005151639 metadata/md5-cache/dev-db/postgresql-9.5.22
+2005151639 metadata/md5-cache/dev-db/postgresql-9.6.17
+2005151639 metadata/md5-cache/dev-db/postgresql-9.6.18
+2005151639 metadata/md5-cache/dev-db/postgresql-9999
+2005150209 metadata/md5-cache/dev-db/redis-5.0.9
+2005151639 metadata/md5-cache/dev-db/slony1-2.2.6
+2005151639 metadata/md5-cache/dev-db/slony1-2.2.7
 1702282310 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 1702282310 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2003282328 metadata/md5-cache/dev-dotnet/dbus-sharp-glib-0.5.0-r1
@@ -40236,7 +40264,6 @@
 2004230839 metadata/md5-cache/dev-java/spec-alpha-0.1.143
 2004230839 metadata/md5-cache/dev-java/spec-alpha-0.2.176
 2004230939 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.103
-2004231409 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.53
 2004251239 metadata/md5-cache/dev-java/swt-4.10
 2004300915 metadata/md5-cache/dev-java/jython-2.7.0-r2
 2004300009 metadata/md5-cache/dev-java/openjfx-11.0.7_p1
@@ -40254,10 +40281,11 @@
 2005110809 metadata/md5-cache/dev-java/openjdk-8.252_p09
 2005101109 metadata/md5-cache/dev-java/openjdk-bin-8.252_p09
 2005121609 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.34
-2005131339 metadata/md5-cache/dev-java/Manifest.gz
 2005131339 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.54
 2005131139 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.55
 2005131209 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.35
+2005151509 metadata/md5-cache/dev-java/Manifest.gz
+2005151509 metadata/md5-cache/dev-java/icedtea-bin-3.16.0
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1702282312 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 1904131209 metadata/md5-cache/dev-lang/duktape-2.2.1
@@ -40498,7 +40526,6 @@
 2004300915 metadata/md5-cache/dev-lang/spidermonkey-68.7.0
 2004300915 metadata/md5-cache/dev-lang/yasm-1.2.0-r1
 2004300915 metadata/md5-cache/dev-lang/yasm-1.3.0
-2004300915 metadata/md5-cache/dev-lang/yasm-9999
 2005011239 metadata/md5-cache/dev-lang/crystal-0.34.0
 2005011341 metadata/md5-cache/dev-lang/hy-0.14.0
 2005011341 metadata/md5-cache/dev-lang/hy-0.15.0
@@ -40543,16 +40570,21 @@
 2005101039 metadata/md5-cache/dev-lang/ruby-2.5.8-r1
 2005101039 metadata/md5-cache/dev-lang/ruby-2.6.6-r2
 2005101039 metadata/md5-cache/dev-lang/ruby-2.7.1-r2
-2005101839 metadata/md5-cache/dev-lang/swi-prolog-8.1.27
-2005111239 metadata/md5-cache/dev-lang/swi-prolog-8.1.28
 2005112139 metadata/md5-cache/dev-lang/yap-6.3.3-r1
-2005132209 metadata/md5-cache/dev-lang/Manifest.gz
 2005132039 metadata/md5-cache/dev-lang/c-intercal-31.0
 2005132209 metadata/md5-cache/dev-lang/erlang-23.0
 2005122339 metadata/md5-cache/dev-lang/python-3.8.2-r2
 2005131009 metadata/md5-cache/dev-lang/swi-prolog-8.1.29
 2005132039 metadata/md5-cache/dev-lang/vala-0.40.20
 2005132039 metadata/md5-cache/dev-lang/vala-0.46.7
+2005151139 metadata/md5-cache/dev-lang/Manifest.gz
+2005142139 metadata/md5-cache/dev-lang/php-7.2.31
+2005142239 metadata/md5-cache/dev-lang/php-7.3.18
+2005142309 metadata/md5-cache/dev-lang/php-7.4.6
+2005140939 metadata/md5-cache/dev-lang/python-3.8.3
+2005141239 metadata/md5-cache/dev-lang/swi-prolog-8.1.30
+2005151139 metadata/md5-cache/dev-lang/swi-prolog-8.1.31
+2005140239 metadata/md5-cache/dev-lang/yasm-9999
 1708300939 metadata/md5-cache/dev-libs/bcm2835-1.52
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
@@ -40745,7 +40777,6 @@
 2003282328 metadata/md5-cache/dev-libs/libofx-0.9.15
 2003282328 metadata/md5-cache/dev-libs/libotf-0.9.16
 2003282328 metadata/md5-cache/dev-libs/libowfat-0.32-r1
-2003282328 metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
 2003282328 metadata/md5-cache/dev-libs/libpcre-8.44
 2003282328 metadata/md5-cache/dev-libs/libpcre-debian-8-r2
 2003282328 metadata/md5-cache/dev-libs/libpfm-4.10.1
@@ -40772,7 +40803,6 @@
 2003282328 metadata/md5-cache/dev-libs/libtasn1-4.16.0
 2003282328 metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
 2003282328 metadata/md5-cache/dev-libs/libtompoly-0.04-r1
-2003282328 metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
 2003282328 metadata/md5-cache/dev-libs/libusb-1.0.22
 2003282328 metadata/md5-cache/dev-libs/libusb-1.0.23-r1
 2003282328 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
@@ -40847,7 +40877,6 @@
 2003282328 metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
 2003282328 metadata/md5-cache/dev-libs/xapian-1.4.15
 2003282328 metadata/md5-cache/dev-libs/xmlsec-1.2.29
-2003282328 metadata/md5-cache/dev-libs/zlog-1.2.12-r1
 2003301909 metadata/md5-cache/dev-libs/libax25-0.0.12_rc5
 2003311822 metadata/md5-cache/dev-libs/389-adminutil-1.1.15
 2003311822 metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
@@ -40870,7 +40899,6 @@
 2003311822 metadata/md5-cache/dev-libs/collada-dom-9999
 2003311822 metadata/md5-cache/dev-libs/console_bridge-0.4.3
 2003311822 metadata/md5-cache/dev-libs/cvector-1.0.3.1
-2003311822 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
 2003311822 metadata/md5-cache/dev-libs/d0_blind_id-0.5
 2003311822 metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r3
 2003311822 metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
@@ -40955,7 +40983,6 @@
 2003311822 metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
 2003311822 metadata/md5-cache/dev-libs/log4cplus-1.2.0
 2003311822 metadata/md5-cache/dev-libs/log4sh-1.4.2
-2003311822 metadata/md5-cache/dev-libs/maloc-1.5-r1
 2003311822 metadata/md5-cache/dev-libs/mathjax-2.7.0
 2003311822 metadata/md5-cache/dev-libs/mathjax-2.7.4
 2003311822 metadata/md5-cache/dev-libs/mongo-c-driver-0.98.2
@@ -41027,7 +41054,6 @@
 2003311822 metadata/md5-cache/dev-libs/vc-1.4.1
 2003311822 metadata/md5-cache/dev-libs/xerces-c-9999
 2003311822 metadata/md5-cache/dev-libs/yaz-3.0.53
-2003311822 metadata/md5-cache/dev-libs/zlog-1.2.12
 2003311822 metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
 2003311822 metadata/md5-cache/dev-libs/zthread-2.3.2-r4
 2004020310 metadata/md5-cache/dev-libs/avro-c-1.9.1
@@ -41412,9 +41438,6 @@
 2005011239 metadata/md5-cache/dev-libs/opencl-clang-8.0.1_p20191001-r1
 2005011239 metadata/md5-cache/dev-libs/opencl-clang-9.0.0
 2005011239 metadata/md5-cache/dev-libs/opencl-clang-9.0.1
-2005011341 metadata/md5-cache/dev-libs/pigpio-72
-2005011341 metadata/md5-cache/dev-libs/pigpio-73
-2005011341 metadata/md5-cache/dev-libs/pigpio-74
 2005011639 metadata/md5-cache/dev-libs/userspace-rcu-0.12.1
 2005021739 metadata/md5-cache/dev-libs/boost-1.73.0
 2005022239 metadata/md5-cache/dev-libs/distorm64-3.4.2
@@ -41519,15 +41542,11 @@
 2005112009 metadata/md5-cache/dev-libs/bemenu-9999
 2005121009 metadata/md5-cache/dev-libs/check-0.14.0-r2
 2005121709 metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r2
-2005121709 metadata/md5-cache/dev-libs/json-c-0.14-r1
 2005121709 metadata/md5-cache/dev-libs/json-c-9999
 2005120809 metadata/md5-cache/dev-libs/libev-4.33
 2005112009 metadata/md5-cache/dev-libs/libfilezilla-0.20.2
 2005112009 metadata/md5-cache/dev-libs/liblouis-3.13.0
-2005121609 metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
-2005121609 metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
 2005121209 metadata/md5-cache/dev-libs/satyr-0.30
-2005132239 metadata/md5-cache/dev-libs/Manifest.gz
 2005132239 metadata/md5-cache/dev-libs/appstream-0.12.11
 2005132039 metadata/md5-cache/dev-libs/atk-2.34.1
 2005132039 metadata/md5-cache/dev-libs/fribidi-1.0.9
@@ -41538,8 +41557,21 @@
 2005131339 metadata/md5-cache/dev-libs/libcec-4.0.4-r1
 2005132039 metadata/md5-cache/dev-libs/libgee-0.20.3
 2005132039 metadata/md5-cache/dev-libs/libgusb-0.3.3
-2005132039 metadata/md5-cache/dev-libs/pcl-1.12-r1
 2005132039 metadata/md5-cache/dev-libs/vala-common-0.46.7
+2005151509 metadata/md5-cache/dev-libs/Manifest.gz
+2005150239 metadata/md5-cache/dev-libs/botan-2.14.0-r1
+2005150139 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
+2005150109 metadata/md5-cache/dev-libs/json-c-0.14-r1
+2005151509 metadata/md5-cache/dev-libs/json-c-0.14-r2
+2005140039 metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+2005151009 metadata/md5-cache/dev-libs/librep-0.92.7
+2005150139 metadata/md5-cache/dev-libs/libtpms-0.7.0-r1
+2005142209 metadata/md5-cache/dev-libs/maloc-1.5-r1
+2005150039 metadata/md5-cache/dev-libs/ocl-icd-2.2.12-r3
+2005150039 metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
+2005150039 metadata/md5-cache/dev-libs/pcl-1.12-r1
+2005140039 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.0
+2005151039 metadata/md5-cache/dev-libs/zlog-1.2.14
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2003282328 metadata/md5-cache/dev-lisp/roswell-19.08.10.101
 2003282328 metadata/md5-cache/dev-lisp/roswell-19.09.12.102
@@ -41805,7 +41837,6 @@
 2002141709 metadata/md5-cache/dev-ml/ocamlweb-1.39
 2002230040 metadata/md5-cache/dev-ml/extlib-1.7.6
 2003202339 metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1
-2003232109 metadata/md5-cache/dev-ml/lablgtk-2.18.10
 2003271609 metadata/md5-cache/dev-ml/camlzip-1.10
 2003282328 metadata/md5-cache/dev-ml/cudf-0.8-r1
 2003282328 metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
@@ -41914,8 +41945,9 @@
 2005051209 metadata/md5-cache/dev-ml/camlp4-4.08_p1
 2005050339 metadata/md5-cache/dev-ml/ocamlmod-0.0.8
 2005050339 metadata/md5-cache/dev-ml/ocamlmod-0.0.9
-2005131639 metadata/md5-cache/dev-ml/Manifest.gz
-2005131639 metadata/md5-cache/dev-ml/camlp5-7.11
+2005142339 metadata/md5-cache/dev-ml/Manifest.gz
+2005140909 metadata/md5-cache/dev-ml/camlp5-7.11
+2005142339 metadata/md5-cache/dev-ml/lablgtk-2.18.10
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Alien-LibGumbo-0.50.0
 1910170740 metadata/md5-cache/dev-perl/AnyEvent-HTTP-2.240.0
@@ -42867,7 +42899,6 @@
 2004032241 metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
 2004032241 metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
 2004032241 metadata/md5-cache/dev-perl/IO-Tee-0.650.0
-2004032241 metadata/md5-cache/dev-perl/IPC-Run-0.960.0
 2004032241 metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
 2004032241 metadata/md5-cache/dev-perl/IPC-Signal-1.0.0-r2
 2004032241 metadata/md5-cache/dev-perl/JSON-2.940.0
@@ -42981,7 +43012,6 @@
 2004032241 metadata/md5-cache/dev-perl/Text-Kakasi-2.40.0-r2
 2004032241 metadata/md5-cache/dev-perl/Text-Levenshtein-0.130.0
 2004032241 metadata/md5-cache/dev-perl/Text-Quoted-2.90.0
-2004032241 metadata/md5-cache/dev-perl/Time-Duration-1.200.0
 2004032241 metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
 2004032241 metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0
 2004032241 metadata/md5-cache/dev-perl/Tree-DAG_Node-1.310.0
@@ -43797,7 +43827,10 @@
 2005131539 metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.260.0
 2005131739 metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r2
 2005131839 metadata/md5-cache/dev-perl/Cairo-1.107.0
-2005131839 metadata/md5-cache/dev-perl/Manifest.gz
+2005140039 metadata/md5-cache/dev-perl/Cairo-GObject-1.5.0
+2005140039 metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+2005140039 metadata/md5-cache/dev-perl/Manifest.gz
+2005140039 metadata/md5-cache/dev-perl/Time-Duration-1.200.0
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -43996,10 +44029,6 @@
 2003282328 metadata/md5-cache/dev-php/libvirt-php-0.5.4
 2003282328 metadata/md5-cache/dev-php/maxmind-db-reader-1.4.1
 2003282328 metadata/md5-cache/dev-php/maxmind-db-reader-1.6.0
-2003282328 metadata/md5-cache/dev-php/pecl-amqp-1.9.4
-2003282328 metadata/md5-cache/dev-php/pecl-amqp-1.9.4-r1
-2003282328 metadata/md5-cache/dev-php/pecl-apcu-5.1.12
-2003282328 metadata/md5-cache/dev-php/pecl-apcu-5.1.17-r1
 2003282328 metadata/md5-cache/dev-php/pecl-apcu-5.1.18
 2003282328 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4-r1
 2003282328 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.5
@@ -44014,8 +44043,6 @@
 2003282328 metadata/md5-cache/dev-php/pecl-http-3.2.3
 2003282328 metadata/md5-cache/dev-php/pecl-imagick-3.4.4
 2003282328 metadata/md5-cache/dev-php/pecl-lzf-1.6.7
-2003282328 metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
-2003282328 metadata/md5-cache/dev-php/pecl-mailparse-3.0.3-r1
 2003282328 metadata/md5-cache/dev-php/pecl-mcrypt-1.0.1
 2003282328 metadata/md5-cache/dev-php/pecl-mcrypt-1.0.2
 2003282328 metadata/md5-cache/dev-php/pecl-memcache-4.0.5.2
@@ -44164,10 +44191,10 @@
 2005061739 metadata/md5-cache/dev-php/pecl-mailparse-3.0.4
 2005090209 metadata/md5-cache/dev-php/pecl-zmq-1.1.3-r2
 2005090209 metadata/md5-cache/dev-php/pecl-zmq-9999
-2005101209 metadata/md5-cache/dev-php/Manifest.gz
-2005101209 metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
-2005101209 metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
-2005101209 metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
+2005151609 metadata/md5-cache/dev-php/Manifest.gz
+2005140209 metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
+2005140209 metadata/md5-cache/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
+2005140209 metadata/md5-cache/dev-php/pecl-mcrypt-1.0.3
 2003261841 metadata/md5-cache/dev-python/python-docs-3.7.7
 2003261841 metadata/md5-cache/dev-python/python-docs-3.8.2
 2003311822 metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
@@ -44227,8 +44254,6 @@
 2004300915 metadata/md5-cache/dev-python/pypy3-7.3.1
 2004300915 metadata/md5-cache/dev-python/pypy3-exe-7.3.0
 2004300915 metadata/md5-cache/dev-python/pypy3-exe-7.3.1
-2004300915 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
-2004300915 metadata/md5-cache/dev-python/python_orocos_kdl-9999
 2004300915 metadata/md5-cache/dev-python/pythonmagick-0.9.17
 2004300915 metadata/md5-cache/dev-python/qscintilla-python-2.11.4
 2004300915 metadata/md5-cache/dev-python/quex-0.65.4
@@ -44238,7 +44263,6 @@
 2004300915 metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1
 2004300915 metadata/md5-cache/dev-python/uranium-4.3.0-r1
 2005011341 metadata/md5-cache/dev-python/3to2-1.1.1-r1
-2005011341 metadata/md5-cache/dev-python/APScheduler-3.5.3
 2005011341 metadata/md5-cache/dev-python/Babel-2.8.0-r1
 2005011341 metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
 2005011341 metadata/md5-cache/dev-python/HeapDict-1.0.0
@@ -44310,7 +44334,6 @@
 2005011341 metadata/md5-cache/dev-python/audioread-2.1.8-r2
 2005011341 metadata/md5-cache/dev-python/authheaders-0.13.0
 2005011341 metadata/md5-cache/dev-python/authres-0.800
-2005011341 metadata/md5-cache/dev-python/authres-1.2.0
 2005011341 metadata/md5-cache/dev-python/autobahn-17.5.1-r2
 2005011341 metadata/md5-cache/dev-python/autobahn-18.3.1
 2005011341 metadata/md5-cache/dev-python/automaton-1.12.1
@@ -44343,7 +44366,6 @@
 2005011341 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
 2005011341 metadata/md5-cache/dev-python/bibtexparser-1.1.0
 2005011341 metadata/md5-cache/dev-python/billiard-3.6.0.0
-2005011341 metadata/md5-cache/dev-python/binaryornot-0.4.3
 2005011341 metadata/md5-cache/dev-python/bitarray-0.8.3
 2005011341 metadata/md5-cache/dev-python/bleach-3.1.4-r1
 2005011341 metadata/md5-cache/dev-python/blessed-1.17.5
@@ -44364,7 +44386,6 @@
 2005011341 metadata/md5-cache/dev-python/botocore-1.15.48
 2005011341 metadata/md5-cache/dev-python/bottle-0.12.18
 2005011341 metadata/md5-cache/dev-python/bottleneck-1.2.1-r1
-2005011341 metadata/md5-cache/dev-python/bpython-0.18
 2005011341 metadata/md5-cache/dev-python/brotlipy-0.7.0-r2
 2005011341 metadata/md5-cache/dev-python/bsddb3-6.2.4
 2005011341 metadata/md5-cache/dev-python/bsddb3-6.2.7
@@ -44427,8 +44448,6 @@
 2005011341 metadata/md5-cache/dev-python/coloredlogs-10.0
 2005011341 metadata/md5-cache/dev-python/colorlog-3.1.4
 2005011341 metadata/md5-cache/dev-python/colorspacious-1.1.0
-2005011341 metadata/md5-cache/dev-python/commonmark-0.5.4
-2005011341 metadata/md5-cache/dev-python/commonmark-0.8.1
 2005011341 metadata/md5-cache/dev-python/configargparse-1.1
 2005011341 metadata/md5-cache/dev-python/configargparse-1.2.3
 2005011341 metadata/md5-cache/dev-python/configclass-0.1.0
@@ -44484,7 +44503,6 @@
 2005011341 metadata/md5-cache/dev-python/demjson-2.2.4
 2005011341 metadata/md5-cache/dev-python/denonavr-0.8.1
 2005011341 metadata/md5-cache/dev-python/deprecated-1.2.7
-2005011341 metadata/md5-cache/dev-python/deprecated-1.2.9
 2005011341 metadata/md5-cache/dev-python/deprecation-2.0.7
 2005011341 metadata/md5-cache/dev-python/dexml-0.5.1
 2005011341 metadata/md5-cache/dev-python/dicttoxml-1.7.4
@@ -44500,7 +44518,6 @@
 2005011341 metadata/md5-cache/dev-python/dj-database-url-0.4.2
 2005011341 metadata/md5-cache/dev-python/dj-database-url-0.5.0
 2005011341 metadata/md5-cache/dev-python/django-2.2.11
-2005011341 metadata/md5-cache/dev-python/django-2.2.12
 2005011341 metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
 2005011341 metadata/md5-cache/dev-python/django-cacheops-4.2
 2005011341 metadata/md5-cache/dev-python/django-cors-headers-3.2.1
@@ -44720,7 +44737,6 @@
 2005011341 metadata/md5-cache/dev-python/httplib2-0.17.0
 2005011341 metadata/md5-cache/dev-python/httpretty-0.9.6
 2005011341 metadata/md5-cache/dev-python/httpretty-1.0.2
-2005011341 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
 2005011341 metadata/md5-cache/dev-python/httpstat-1.2.1-r1
 2005011341 metadata/md5-cache/dev-python/humanfriendly-4.18
 2005011341 metadata/md5-cache/dev-python/humanize-0.5.1
@@ -44757,7 +44773,6 @@
 2005011341 metadata/md5-cache/dev-python/invoke-1.1.1
 2005011341 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
 2005011341 metadata/md5-cache/dev-python/ioflo-1.7.5
-2005011341 metadata/md5-cache/dev-python/ipaddr-2.2.0
 2005011341 metadata/md5-cache/dev-python/ipaddress-1.0.23
 2005011341 metadata/md5-cache/dev-python/ipdb-0.10.3
 2005011341 metadata/md5-cache/dev-python/ipdbplugin-1.4
@@ -45263,7 +45278,6 @@
 2005011341 metadata/md5-cache/dev-python/pygpgme-0.3-r2
 2005011341 metadata/md5-cache/dev-python/pygpu-0.6.7
 2005011341 metadata/md5-cache/dev-python/pygraphviz-1.5
-2005011341 metadata/md5-cache/dev-python/pygresql-5.0.6
 2005011341 metadata/md5-cache/dev-python/pygsl-2.1.1
 2005011341 metadata/md5-cache/dev-python/pyh2o-9999
 2005011341 metadata/md5-cache/dev-python/pyicu-2.4.2
@@ -45357,7 +45371,6 @@
 2005011341 metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
 2005011341 metadata/md5-cache/dev-python/pyspectrum2-0.2.0
 2005011341 metadata/md5-cache/dev-python/pyspf-2.0.12
-2005011341 metadata/md5-cache/dev-python/pyspf-2.0.14
 2005011341 metadata/md5-cache/dev-python/pysrt-1.1.1
 2005011341 metadata/md5-cache/dev-python/pysrt-9999
 2005011341 metadata/md5-cache/dev-python/pysvg-0.2.2_p3
@@ -45646,7 +45659,6 @@
 2005011341 metadata/md5-cache/dev-python/simplespectral-9999
 2005011341 metadata/md5-cache/dev-python/simpy-3.0.8
 2005011341 metadata/md5-cache/dev-python/singledispatch-3.4.0.3
-2005011341 metadata/md5-cache/dev-python/six-1.14.0
 2005011341 metadata/md5-cache/dev-python/slackclient-2.5.0
 2005011341 metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1
 2005011341 metadata/md5-cache/dev-python/slimit-0.8.1-r1
@@ -45674,7 +45686,6 @@
 2005011341 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
 2005011341 metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
 2005011341 metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
-2005011341 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
 2005011341 metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
 2005011341 metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
 2005011341 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -45973,7 +45984,6 @@
 2005031339 metadata/md5-cache/dev-python/scrypt-0.8.13-r2
 2005031309 metadata/md5-cache/dev-python/secretstorage-3.1.1-r1
 2005031339 metadata/md5-cache/dev-python/send2trash-1.5.0-r1
-2005031609 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
 2005031309 metadata/md5-cache/dev-python/terminado-0.8.3
 2005031339 metadata/md5-cache/dev-python/tinycss2-1.0.2
 2005031339 metadata/md5-cache/dev-python/tld-0.12.1
@@ -46114,7 +46124,6 @@
 2005091639 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5
 2005091109 metadata/md5-cache/dev-python/pylast-3.2.1
 2005071239 metadata/md5-cache/dev-python/pypam-0.5.0-r4
-2005090239 metadata/md5-cache/dev-python/pypugjs-5.9.4
 2005091109 metadata/md5-cache/dev-python/pysrt-1.1.2
 2005082039 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
 2005071839 metadata/md5-cache/dev-python/python-caja-1.24.0
@@ -46191,7 +46200,6 @@
 2005120639 metadata/md5-cache/dev-python/botocore-9999
 2005121009 metadata/md5-cache/dev-python/bpython-0.19
 2005111839 metadata/md5-cache/dev-python/commonmark-0.9.1
-2005121909 metadata/md5-cache/dev-python/django-3.0.6
 2005111839 metadata/md5-cache/dev-python/importlib_resources-1.4.0
 2005121009 metadata/md5-cache/dev-python/libcloud-3.0.0
 2005120909 metadata/md5-cache/dev-python/libvirt-python-6.0.0
@@ -46202,13 +46210,11 @@
 2005111839 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
 2005112009 metadata/md5-cache/dev-python/ovs-2.13.0
 2005121009 metadata/md5-cache/dev-python/peewee-3.13.2
-2005121809 metadata/md5-cache/dev-python/pockets-0.9.1
 2005111839 metadata/md5-cache/dev-python/pyasn1-0.4.8
 2005112339 metadata/md5-cache/dev-python/pycurl-7.43.0.5
 2005121009 metadata/md5-cache/dev-python/pycxx-7.1.2-r2
 2005111839 metadata/md5-cache/dev-python/pyftpdlib-1.5.6
 2005111839 metadata/md5-cache/dev-python/pygments-2.6.1
-2005112009 metadata/md5-cache/dev-python/pygresql-5.1
 2005121009 metadata/md5-cache/dev-python/pyphen-0.9.5
 2005121909 metadata/md5-cache/dev-python/pytest-asyncio-0.12.0
 2005111839 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
@@ -46223,7 +46229,6 @@
 2005112139 metadata/md5-cache/dev-python/xlwt-1.3.0-r1
 2005111839 metadata/md5-cache/dev-python/zipp-2.0.1
 2005121009 metadata/md5-cache/dev-python/zstandard-0.13.0
-2005132039 metadata/md5-cache/dev-python/Manifest.gz
 2005131809 metadata/md5-cache/dev-python/SaltTesting-2018.9.21
 2005132039 metadata/md5-cache/dev-python/apispec-3.3.0
 2005131209 metadata/md5-cache/dev-python/appdirs-1.4.4
@@ -46235,16 +46240,11 @@
 2005132039 metadata/md5-cache/dev-python/dbusmock-0.18.3
 2005131039 metadata/md5-cache/dev-python/django-otp-0.9.1
 2005131639 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
-2005130709 metadata/md5-cache/dev-python/google-api-core-1.17.0
-2005131009 metadata/md5-cache/dev-python/google-api-python-client-1.8.3
 2005130709 metadata/md5-cache/dev-python/google-auth-1.14.3
 2005130709 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
-2005130709 metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
-2005131809 metadata/md5-cache/dev-python/h5py-2.10.0-r1
 2005131009 metadata/md5-cache/dev-python/hypothesis-5.13.1
 2005132039 metadata/md5-cache/dev-python/inflect-4.1.0
 2005131809 metadata/md5-cache/dev-python/ioflo-2.0.0
-2005132039 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
 2005131439 metadata/md5-cache/dev-python/jaraco-packaging-8.1.0
 2005130539 metadata/md5-cache/dev-python/llfuse-1.3.6
 2005131039 metadata/md5-cache/dev-python/markdown-3.2.2
@@ -46271,12 +46271,40 @@
 2005131639 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
 2005131639 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
 2005132039 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
-2005131439 metadata/md5-cache/dev-python/sqlparse-0.3.1
 2005130309 metadata/md5-cache/dev-python/taskflow-4.1.0
 2005130139 metadata/md5-cache/dev-python/treq-20.4.1
 2005131209 metadata/md5-cache/dev-python/tzlocal-2.1
 2005130709 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
-2005132039 metadata/md5-cache/dev-python/zipp-3.1.0
+2005151009 metadata/md5-cache/dev-python/APScheduler-3.6.3
+2005151639 metadata/md5-cache/dev-python/Manifest.gz
+2005141639 metadata/md5-cache/dev-python/authres-1.2.0
+2005140739 metadata/md5-cache/dev-python/bareos-19.2.7
+2005140009 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+2005140909 metadata/md5-cache/dev-python/deprecated-1.2.10
+2005151339 metadata/md5-cache/dev-python/deprecated-1.2.9
+2005141509 metadata/md5-cache/dev-python/django-2.2.12
+2005141509 metadata/md5-cache/dev-python/django-3.0.6
+2005150039 metadata/md5-cache/dev-python/google-api-core-1.17.0
+2005150039 metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
+2005151009 metadata/md5-cache/dev-python/google-apitools-0.5.31
+2005150039 metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
+2005141109 metadata/md5-cache/dev-python/h5py-2.10.0-r1
+2005151339 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+2005150709 metadata/md5-cache/dev-python/ipaddr-2.2.0
+2005141109 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+2005140039 metadata/md5-cache/dev-python/pockets-0.9.1
+2005151639 metadata/md5-cache/dev-python/pygresql-5.0.6
+2005151639 metadata/md5-cache/dev-python/pygresql-5.1
+2005151109 metadata/md5-cache/dev-python/pypugjs-5.9.4-r1
+2005151339 metadata/md5-cache/dev-python/pyspf-2.0.14
+2005141839 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+2005141839 metadata/md5-cache/dev-python/python_orocos_kdl-9999
+2005140909 metadata/md5-cache/dev-python/setuptools-46.3.0
+2005141509 metadata/md5-cache/dev-python/six-1.14.0
+2005141939 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+2005140209 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+2005141509 metadata/md5-cache/dev-python/sqlparse-0.3.1
+2005141109 metadata/md5-cache/dev-python/zipp-3.1.0
 2003281309 metadata/md5-cache/dev-qt/qt-docs-5.14.1_p202001241012
 2003282328 metadata/md5-cache/dev-qt/qtchooser-66
 2003282328 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -46348,14 +46376,12 @@
 2004211439 metadata/md5-cache/dev-qt/qtgui-5.14.1-r4
 2004300915 metadata/md5-cache/dev-qt/qtdeclarative-5.14.1-r2
 2004300915 metadata/md5-cache/dev-qt/qtwebengine-5.14.1
-2004300915 metadata/md5-cache/dev-qt/qtwebengine-5.14.2
 2004300915 metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
 2005011239 metadata/md5-cache/dev-qt/qt-creator-4.10.1
 2005011239 metadata/md5-cache/dev-qt/qt-creator-4.8.2
 2005011239 metadata/md5-cache/dev-qt/qt-creator-9999
 2004301339 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2005060609 metadata/md5-cache/dev-qt/qt-creator-4.12.0
-2005091139 metadata/md5-cache/dev-qt/Manifest.gz
 2005091109 metadata/md5-cache/dev-qt/assistant-5.14.2
 2005091109 metadata/md5-cache/dev-qt/designer-5.14.2
 2005091109 metadata/md5-cache/dev-qt/linguist-5.14.2
@@ -46372,7 +46398,6 @@
 2005091109 metadata/md5-cache/dev-qt/qtgui-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qthelp-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtimageformats-5.14.2
-2005091109 metadata/md5-cache/dev-qt/qtlocation-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtmultimedia-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtnetwork-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtopengl-5.14.2
@@ -46394,6 +46419,9 @@
 2005091109 metadata/md5-cache/dev-qt/qtx11extras-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtxml-5.14.2
 2005091109 metadata/md5-cache/dev-qt/qtxmlpatterns-5.14.2
+2005142039 metadata/md5-cache/dev-qt/Manifest.gz
+2005142039 metadata/md5-cache/dev-qt/qtlocation-5.14.2
+2005142039 metadata/md5-cache/dev-qt/qtwebengine-5.14.2
 2004300915 metadata/md5-cache/dev-ros/actionlib-1.11.13
 2004300915 metadata/md5-cache/dev-ros/actionlib-1.11.14
 2004300915 metadata/md5-cache/dev-ros/actionlib-1.11.15
@@ -49049,9 +49077,9 @@
 2005112339 metadata/md5-cache/dev-ruby/sinatra-2.0.8.1-r1
 2005112039 metadata/md5-cache/dev-ruby/strptime-0.2.4
 2005121739 metadata/md5-cache/dev-ruby/xdr-3.0.0
-2005131809 metadata/md5-cache/dev-ruby/Manifest.gz
 2005130839 metadata/md5-cache/dev-ruby/mime-types-data-3.2020.0512
-2005131809 metadata/md5-cache/dev-ruby/rmagick-3.2.0
+2005141109 metadata/md5-cache/dev-ruby/Manifest.gz
+2005141109 metadata/md5-cache/dev-ruby/rmagick-3.2.0
 1801201438 metadata/md5-cache/dev-scheme/bytestructures-1.0.1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
@@ -49503,8 +49531,6 @@
 2003282328 metadata/md5-cache/dev-util/jenkins-bin-2.228
 2003282328 metadata/md5-cache/dev-util/kbuild-0.1.9998.3149
 2003282328 metadata/md5-cache/dev-util/kbuild-9999
-2003282328 metadata/md5-cache/dev-util/kernelshark-1.0
-2003282328 metadata/md5-cache/dev-util/kernelshark-9999
 2003282328 metadata/md5-cache/dev-util/leaktracer-2.4-r3
 2003282328 metadata/md5-cache/dev-util/lockrun-20120508-r1
 2003282328 metadata/md5-cache/dev-util/ltrace-0.7.3_p4
@@ -49899,7 +49925,6 @@
 2004300915 metadata/md5-cache/dev-util/redo-99999
 2004300915 metadata/md5-cache/dev-util/rpmdevtools-8.10-r2
 2004300915 metadata/md5-cache/dev-util/rr-5.3.0-r1
-2004300915 metadata/md5-cache/dev-util/rt-tests-1.8
 2004300915 metadata/md5-cache/dev-util/scanmem-0.17
 2004300915 metadata/md5-cache/dev-util/setconf-0.6.6
 2004300915 metadata/md5-cache/dev-util/smem-1.4
@@ -49911,15 +49936,12 @@
 2004300915 metadata/md5-cache/dev-util/systemtap-2.4-r1
 2004300915 metadata/md5-cache/dev-util/systemtap-3.1-r1
 2004300915 metadata/md5-cache/dev-util/systemtap-4.0-r1
-2004300915 metadata/md5-cache/dev-util/trace-cmd-9999
 2004300915 metadata/md5-cache/dev-util/uftrace-0.9.3
 2004300915 metadata/md5-cache/dev-util/umockdev-0.11.3
 2004300915 metadata/md5-cache/dev-util/umockdev-0.12.1
 2004300915 metadata/md5-cache/dev-util/umockdev-0.9.4
 2004300915 metadata/md5-cache/dev-util/uncrustify-0.66.1
-2004300915 metadata/md5-cache/dev-util/uncrustify-0.68.1
 2004300915 metadata/md5-cache/dev-util/uncrustify-0.69.0
-2004300915 metadata/md5-cache/dev-util/uncrustify-9999
 2004300109 metadata/md5-cache/dev-util/vulkan-headers-1.2.137
 2004300915 metadata/md5-cache/dev-util/vulkan-tools-1.1.124
 2004300915 metadata/md5-cache/dev-util/vulkan-tools-1.2.133-r1
@@ -50107,19 +50129,11 @@
 2005102339 metadata/md5-cache/dev-util/sysprof-capture-3.34.1-r1
 2005101439 metadata/md5-cache/dev-util/unrpyc-1.1.3
 2005122139 metadata/md5-cache/dev-util/buildbot-console-view-2.7.0
-2005122139 metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
 2005122139 metadata/md5-cache/dev-util/buildbot-pkg-2.7.0
 2005122139 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.7.0
-2005122139 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
 2005122139 metadata/md5-cache/dev-util/buildbot-www-2.7.0
 2005112039 metadata/md5-cache/dev-util/hfstospell-0.5.1
 2005121009 metadata/md5-cache/dev-util/itstool-2.0.6-r1
-2005121609 metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
-2005132109 metadata/md5-cache/dev-util/Manifest.gz
-2005130139 metadata/md5-cache/dev-util/buildbot-2.7.0
-2005130139 metadata/md5-cache/dev-util/buildbot-9999
-2005130139 metadata/md5-cache/dev-util/buildbot-worker-2.7.0
-2005130139 metadata/md5-cache/dev-util/buildbot-worker-9999
 2005131739 metadata/md5-cache/dev-util/catkin-0.8.3
 2005131739 metadata/md5-cache/dev-util/catkin-9999
 2005131639 metadata/md5-cache/dev-util/clion-2020.1.1
@@ -50139,6 +50153,20 @@
 2005131339 metadata/md5-cache/dev-util/pycharm-community-2020.1.1
 2005131339 metadata/md5-cache/dev-util/pycharm-professional-2020.1
 2005131339 metadata/md5-cache/dev-util/pycharm-professional-2020.1.1
+2005151809 metadata/md5-cache/dev-util/Manifest.gz
+2005140009 metadata/md5-cache/dev-util/buildbot-2.7.0
+2005140009 metadata/md5-cache/dev-util/buildbot-9999
+2005132309 metadata/md5-cache/dev-util/buildbot-grid-view-2.7.0
+2005140009 metadata/md5-cache/dev-util/buildbot-worker-2.7.0
+2005140009 metadata/md5-cache/dev-util/buildbot-worker-9999
+2005132309 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.7.0
+2005150139 metadata/md5-cache/dev-util/kernelshark-1.0
+2005150139 metadata/md5-cache/dev-util/kernelshark-9999
+2005150039 metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
+2005151809 metadata/md5-cache/dev-util/rt-tests-1.8
+2005150139 metadata/md5-cache/dev-util/trace-cmd-9999
+2005141209 metadata/md5-cache/dev-util/uncrustify-0.71.0
+2005141209 metadata/md5-cache/dev-util/uncrustify-9999
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -50293,8 +50321,8 @@
 2005100128 metadata/md5-cache/dev-vcs/hg-evolve-10.0.0
 2005112339 metadata/md5-cache/dev-vcs/lab-0.17.2
 2005121009 metadata/md5-cache/dev-vcs/mercurial-5.3.2
-2005132039 metadata/md5-cache/dev-vcs/Manifest.gz
-2005132039 metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
+2005141109 metadata/md5-cache/dev-vcs/Manifest.gz
+2005141109 metadata/md5-cache/dev-vcs/subversion-1.13.0-r1
 1707090139 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
@@ -50504,14 +50532,14 @@
 2004300915 metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r1
 2004300915 metadata/md5-cache/games-arcade/solarwolf-1.5-r2
 2004300915 metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r3
-2005090439 metadata/md5-cache/games-arcade/supertux-0.6.2_rc1
-2005102339 metadata/md5-cache/games-arcade/Manifest.gz
 2005102009 metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
 2005102339 metadata/md5-cache/games-arcade/gnome-nibbles-3.36.0
 2005102339 metadata/md5-cache/games-arcade/gnome-robots-3.36.0
 2005102009 metadata/md5-cache/games-arcade/gunocide2ex-1.0
 2005102009 metadata/md5-cache/games-arcade/shovel-knight-3.3
 2005102009 metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
+2005151009 metadata/md5-cache/games-arcade/Manifest.gz
+2005151009 metadata/md5-cache/games-arcade/supertux-0.6.2
 1711182338 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 1907282009 metadata/md5-cache/games-board/gnugo-3.9.1-r2
 1702282322 metadata/md5-cache/games-board/maitretarot-0.1.98-r1
@@ -51103,7 +51131,6 @@
 2003282328 metadata/md5-cache/games-strategy/tornado-1.4-r2
 2003282328 metadata/md5-cache/games-strategy/warzone2100-3.3.0
 2003311822 metadata/md5-cache/games-strategy/asc-2.6.0.0-r2
-2003311822 metadata/md5-cache/games-strategy/colobot-0.1.12
 2003311822 metadata/md5-cache/games-strategy/colobot-9999
 2003311822 metadata/md5-cache/games-strategy/crimson-0.5.3-r1
 2003311822 metadata/md5-cache/games-strategy/dominions2-2.16
@@ -51150,12 +51177,13 @@
 2004300915 metadata/md5-cache/games-strategy/widelands-0.20-r1
 2004300915 metadata/md5-cache/games-strategy/widelands-9999
 2005091839 metadata/md5-cache/games-strategy/freeorion-0.4.9_p20200409-r1
-2005102009 metadata/md5-cache/games-strategy/Manifest.gz
 2005102009 metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
 2005102009 metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r1
 2005102009 metadata/md5-cache/games-strategy/knights-demo-1.32-r2
 2005102009 metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
 2005102009 metadata/md5-cache/games-strategy/spaz-1.605-r1
+2005141339 metadata/md5-cache/games-strategy/Manifest.gz
+2005141339 metadata/md5-cache/games-strategy/colobot-0.1.12
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1806110509 metadata/md5-cache/games-util/etswitch-0.1.14-r1
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
@@ -51347,8 +51375,9 @@
 2005102339 metadata/md5-cache/gnome-extra/nemo-4.0.6
 2005102339 metadata/md5-cache/gnome-extra/nm-applet-1.8.25
 2005102339 metadata/md5-cache/gnome-extra/sushi-3.34.0
-2005132039 metadata/md5-cache/gnome-extra/Manifest.gz
 2005132039 metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
+2005142339 metadata/md5-cache/gnome-extra/Manifest.gz
+2005142339 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-33-r2
 2003282328 metadata/md5-cache/gnustep-apps/cenon-4.0.6
 2003282328 metadata/md5-cache/gnustep-apps/graphos-0.7
 2003282328 metadata/md5-cache/gnustep-apps/pikopixel-1.0_beta9-r4
@@ -51938,7 +51967,6 @@
 2005071109 metadata/md5-cache/kde-apps/mailimporter-20.04.0
 2005071109 metadata/md5-cache/kde-apps/marble-20.04.0
 2005071109 metadata/md5-cache/kde-apps/mbox-importer-20.04.0
-2005071109 metadata/md5-cache/kde-apps/messagelib-20.04.0
 2005071109 metadata/md5-cache/kde-apps/minuet-20.04.0
 2005071109 metadata/md5-cache/kde-apps/okular-20.04.0
 2005071109 metadata/md5-cache/kde-apps/palapeli-20.04.0
@@ -51966,7 +51994,8 @@
 2005102109 metadata/md5-cache/kde-apps/konsole-19.12.3-r1
 2005102109 metadata/md5-cache/kde-apps/krdc-19.12.3-r1
 2005121009 metadata/md5-cache/kde-apps/kio-extras-19.12.3-r1
-2005130409 metadata/md5-cache/kde-apps/Manifest.gz
+2005142039 metadata/md5-cache/kde-apps/Manifest.gz
+2005142039 metadata/md5-cache/kde-apps/messagelib-20.04.0-r1
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
 2004160210 metadata/md5-cache/kde-frameworks/attica-5.67.0
 2004160210 metadata/md5-cache/kde-frameworks/baloo-5.67.0-r1
@@ -52051,7 +52080,6 @@
 2004300915 metadata/md5-cache/kde-frameworks/kfilemetadata-5.67.0
 2004300915 metadata/md5-cache/kde-frameworks/ki18n-5.67.0
 2005011341 metadata/md5-cache/kde-frameworks/kapidox-5.67.0-r1
-2005091439 metadata/md5-cache/kde-frameworks/Manifest.gz
 2005091439 metadata/md5-cache/kde-frameworks/attica-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/baloo-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
@@ -52094,7 +52122,6 @@
 2005091439 metadata/md5-cache/kde-frameworks/kidletime-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/kinit-5.70.0
-2005091439 metadata/md5-cache/kde-frameworks/kio-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/kirigami-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
@@ -52126,7 +52153,6 @@
 2005091439 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
-2005091439 metadata/md5-cache/kde-frameworks/plasma-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/prison-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/purpose-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
@@ -52135,6 +52161,9 @@
 2005091439 metadata/md5-cache/kde-frameworks/syndication-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
 2005091439 metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
+2005151139 metadata/md5-cache/kde-frameworks/Manifest.gz
+2005151139 metadata/md5-cache/kde-frameworks/kio-5.70.0-r1
+2005142039 metadata/md5-cache/kde-frameworks/plasma-5.70.1
 2004020310 metadata/md5-cache/kde-misc/playbar2-2.5-r1
 2004160210 metadata/md5-cache/kde-misc/basket-2.49b
 2004160210 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
@@ -52182,7 +52211,6 @@
 2004160210 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.17.5
 2004160210 metadata/md5-cache/kde-plasma/kgamma-5.17.5
 2004160210 metadata/md5-cache/kde-plasma/khotkeys-5.17.5
-2004160210 metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1
 2004160210 metadata/md5-cache/kde-plasma/kmenuedit-5.17.5
 2004160210 metadata/md5-cache/kde-plasma/kscreen-5.17.5
 2004160210 metadata/md5-cache/kde-plasma/kscreenlocker-5.17.5
@@ -52216,7 +52244,6 @@
 2004160210 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.17.5
 2004160210 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.17.5
 2004300915 metadata/md5-cache/kde-plasma/breeze-gtk-5.17.5
-2005072309 metadata/md5-cache/kde-plasma/Manifest.gz
 2005071109 metadata/md5-cache/kde-plasma/bluedevil-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/breeze-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
@@ -52231,7 +52258,6 @@
 2005071109 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/kgamma-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/khotkeys-5.18.5
-2005071109 metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/kscreen-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
@@ -52265,6 +52291,9 @@
 2005071109 metadata/md5-cache/kde-plasma/user-manager-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
 2005071109 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
+2005140039 metadata/md5-cache/kde-plasma/Manifest.gz
+2005140039 metadata/md5-cache/kde-plasma/kinfocenter-5.17.5-r1
+2005140039 metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
 1804072008 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
@@ -52362,17 +52391,17 @@
 2005011341 metadata/md5-cache/mail-client/alot-0.9
 2005011341 metadata/md5-cache/mail-client/alot-9999
 2005020309 metadata/md5-cache/mail-client/neomutt-20200501
-2005051209 metadata/md5-cache/mail-client/alpine-2.22-r1
-2005041039 metadata/md5-cache/mail-client/mutt-1.14.0
 2005051609 metadata/md5-cache/mail-client/thunderbird-bin-68.8.0
 2005061609 metadata/md5-cache/mail-client/thunderbird-68.8.0
 2005081846 metadata/md5-cache/mail-client/evolution-3.36.2
 2005081846 metadata/md5-cache/mail-client/roundcube-1.4.4
-2005111609 metadata/md5-cache/mail-client/Manifest.gz
 2005102339 metadata/md5-cache/mail-client/geary-3.34.2-r3
 2005102339 metadata/md5-cache/mail-client/geary-3.36.0
 2005102339 metadata/md5-cache/mail-client/geary-3.36.1
-2005111409 metadata/md5-cache/mail-client/roundcube-1.3.11
+2005150139 metadata/md5-cache/mail-client/Manifest.gz
+2005150139 metadata/md5-cache/mail-client/alpine-2.22-r1
+2005142139 metadata/md5-cache/mail-client/mutt-1.14.0-r1
+2005150039 metadata/md5-cache/mail-client/roundcube-1.3.11
 1911101439 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
 1911061339 metadata/md5-cache/mail-filter/libsieve-2.2.7
 1910111911 metadata/md5-cache/mail-filter/mailfilter-0.8.4
@@ -52412,8 +52441,6 @@
 2003311822 metadata/md5-cache/mail-filter/dcc-1.3.154
 2003311822 metadata/md5-cache/mail-filter/dkimproxy-1.4.1
 2003311822 metadata/md5-cache/mail-filter/dovecot_deleted_to_trash-0.6
-2003311822 metadata/md5-cache/mail-filter/exim-geoip-0.1
-2003311822 metadata/md5-cache/mail-filter/exim-p0f-0.1
 2003311822 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 2003311822 metadata/md5-cache/mail-filter/mapson-3.3
 2003311822 metadata/md5-cache/mail-filter/popfile-1.1.3-r1
@@ -52458,11 +52485,13 @@
 2005061239 metadata/md5-cache/mail-filter/zdkimfilter-2.1
 2005111739 metadata/md5-cache/mail-filter/spamassassin-3.4.4-r1
 2005102009 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
-2005122109 metadata/md5-cache/mail-filter/Manifest.gz
 2005122109 metadata/md5-cache/mail-filter/dcc-1.3.158
 2005122109 metadata/md5-cache/mail-filter/libspf2-1.2.10
 2005122109 metadata/md5-cache/mail-filter/libsrs_alt-1.0-r1
 2005122109 metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
+2005151639 metadata/md5-cache/mail-filter/Manifest.gz
+2005151639 metadata/md5-cache/mail-filter/exim-geoip-0.1-r1
+2005151639 metadata/md5-cache/mail-filter/exim-p0f-0.1-r1
 1910071309 metadata/md5-cache/mail-mta/esmtp-1.2-r1
 2003282328 metadata/md5-cache/mail-mta/nullmailer-2.2-r1
 2003282328 metadata/md5-cache/mail-mta/opensmtpd-6.6.4_p1
@@ -53102,8 +53131,6 @@
 2004300915 metadata/md5-cache/media-gfx/eog-plugins-3.26.4-r1
 2004300915 metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
 2004300915 metadata/md5-cache/media-gfx/exiv2-0.27.2
-2004300915 metadata/md5-cache/media-gfx/fontforge-20170731-r5
-2004300915 metadata/md5-cache/media-gfx/fontforge-20190801
 2004300915 metadata/md5-cache/media-gfx/fr0st-1.4-r2
 2004300915 metadata/md5-cache/media-gfx/gimp-2.10.14-r1
 2004300915 metadata/md5-cache/media-gfx/gimp-2.8.22-r2
@@ -53130,8 +53157,6 @@
 2005011341 metadata/md5-cache/media-gfx/displaycal-3.8.9.3-r1
 2005011341 metadata/md5-cache/media-gfx/fontypython-0.4.4-r3
 2005011341 metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
-2005010209 metadata/md5-cache/media-gfx/imagemagick-6.9.11.7
-2005010209 metadata/md5-cache/media-gfx/imagemagick-7.0.10.7-r1
 2005011341 metadata/md5-cache/media-gfx/img2pdf-0.3.3
 2005011341 metadata/md5-cache/media-gfx/img2pdf-0.3.4
 2005011341 metadata/md5-cache/media-gfx/printrun-20150310-r4
@@ -53157,8 +53182,6 @@
 2005081846 metadata/md5-cache/media-gfx/eom-1.22.2
 2005071939 metadata/md5-cache/media-gfx/graphicsmagick-1.3.35
 2005081846 metadata/md5-cache/media-gfx/inkscape-9999
-2005091939 metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
-2005091939 metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
 2005102339 metadata/md5-cache/media-gfx/entangle-2.0
 2005102339 metadata/md5-cache/media-gfx/eog-3.32.2
 2005102339 metadata/md5-cache/media-gfx/frogr-1.5
@@ -53174,9 +53197,11 @@
 2005102339 metadata/md5-cache/media-gfx/simple-scan-3.34.6
 2005102339 metadata/md5-cache/media-gfx/viewnior-1.7-r1
 2005121009 metadata/md5-cache/media-gfx/hugin-2019.2.0
-2005131339 metadata/md5-cache/media-gfx/Manifest.gz
 2005131139 metadata/md5-cache/media-gfx/fbida-9999
-2005131339 metadata/md5-cache/media-gfx/fontforge-20200314
+2005151809 metadata/md5-cache/media-gfx/Manifest.gz
+2005140309 metadata/md5-cache/media-gfx/fontforge-20200314
+2005151809 metadata/md5-cache/media-gfx/imagemagick-6.9.11.9
+2005151809 metadata/md5-cache/media-gfx/imagemagick-7.0.10.9
 1906032239 metadata/md5-cache/media-libs/aldumb-0.9.3
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1806121239 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
@@ -53250,11 +53275,8 @@
 2003282328 metadata/md5-cache/media-libs/libcdr-9999
 2003282328 metadata/md5-cache/media-libs/libdmtx-0.7.5
 2003282328 metadata/md5-cache/media-libs/libdvd-audio-1.0.0
-2003282328 metadata/md5-cache/media-libs/libdvdnav-6.0.1
-2003282328 metadata/md5-cache/media-libs/libdvdnav-9999
 2003282328 metadata/md5-cache/media-libs/libdvdread-6.0.1
 2003282328 metadata/md5-cache/media-libs/libdvdread-6.0.2
-2003282328 metadata/md5-cache/media-libs/libdvdread-9999
 2003282328 metadata/md5-cache/media-libs/libfreehand-9999
 2003282328 metadata/md5-cache/media-libs/libgig-9999
 2003282328 metadata/md5-cache/media-libs/libhdhomerun-20190621
@@ -53511,7 +53533,6 @@
 2004032241 metadata/md5-cache/media-libs/libdiscid-0.6.1
 2004032241 metadata/md5-cache/media-libs/libdiscid-0.6.2
 2004032241 metadata/md5-cache/media-libs/libdvdcss-1.4.2
-2004032241 metadata/md5-cache/media-libs/libdvdnav-6.0.0
 2004032241 metadata/md5-cache/media-libs/libdvdread-6.0.0
 2004032241 metadata/md5-cache/media-libs/libebur128-1.2.4
 2004032241 metadata/md5-cache/media-libs/libexif-0.6.21-r3
@@ -53620,7 +53641,6 @@
 2004142039 metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
 2004142039 metadata/md5-cache/media-libs/libprojectm-3.1.1_rc8-r1
 2004142039 metadata/md5-cache/media-libs/libprojectm-3.1.2
-2004142039 metadata/md5-cache/media-libs/libprojectm-3.1.3
 2004142039 metadata/md5-cache/media-libs/libprojectm-9999
 2004142039 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
 2004150309 metadata/md5-cache/media-libs/openh264-1.7.0-r1
@@ -53737,7 +53757,6 @@
 2005011239 metadata/md5-cache/media-libs/osl-1.10.5
 2005011341 metadata/md5-cache/media-libs/portmidi-217-r3
 2005011709 metadata/md5-cache/media-libs/vidstab-1.1.0-r2
-2005020409 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430
 2005021609 metadata/md5-cache/media-libs/libv4l-1.18.1
 2005021239 metadata/md5-cache/media-libs/svgalib-1.9.25-r6
 2005032239 metadata/md5-cache/media-libs/gst-plugins-bad-1.16.2
@@ -53761,8 +53780,6 @@
 2005071609 metadata/md5-cache/media-libs/libaacs-0.10.0
 2005091539 metadata/md5-cache/media-libs/libaom-2.0.0_rc1
 2005091539 metadata/md5-cache/media-libs/libaom-9999
-2005071609 metadata/md5-cache/media-libs/libdvdnav-6.1.0
-2005071609 metadata/md5-cache/media-libs/libdvdread-6.1.0
 2005091309 metadata/md5-cache/media-libs/zimg-2.9.2
 2005102009 metadata/md5-cache/media-libs/allegro-5.2.5.0
 2005102339 metadata/md5-cache/media-libs/babl-0.1.74
@@ -53819,8 +53836,20 @@
 2005102339 metadata/md5-cache/media-libs/waffle-1.6.0-r1
 2005102339 metadata/md5-cache/media-libs/waffle-1.6.1-r1
 2005102339 metadata/md5-cache/media-libs/waffle-9999
-2005132039 metadata/md5-cache/media-libs/Manifest.gz
-2005132039 metadata/md5-cache/media-libs/gd-2.3.0
+2005150839 metadata/md5-cache/media-libs/Manifest.gz
+2005150839 metadata/md5-cache/media-libs/exiftool-11.99
+2005141109 metadata/md5-cache/media-libs/gd-2.3.0
+2005141239 metadata/md5-cache/media-libs/harfbuzz-2.6.6
+2005141739 metadata/md5-cache/media-libs/libdvdnav-6.0.0
+2005141739 metadata/md5-cache/media-libs/libdvdnav-6.0.1
+2005141739 metadata/md5-cache/media-libs/libdvdnav-6.1.0
+2005141739 metadata/md5-cache/media-libs/libdvdnav-9999
+2005141539 metadata/md5-cache/media-libs/libdvdread-6.1.1
+2005141539 metadata/md5-cache/media-libs/libdvdread-9999
+2005141739 metadata/md5-cache/media-libs/libprojectm-3.1.3
+2005141639 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200430
+2005142339 metadata/md5-cache/media-libs/mesa-20.0.7
+2005142339 metadata/md5-cache/media-libs/mesa-20.1.0_rc3
 1702282326 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 1801032209 metadata/md5-cache/media-plugins/gmpc-discogs-0.20.0
 1801032209 metadata/md5-cache/media-plugins/gmpc-extraplaylist-0.20.0
@@ -53984,8 +54013,6 @@
 2003311822 metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1
 2003311822 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
 2003311822 metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
-2003311822 metadata/md5-cache/media-plugins/live-2018.01.29
-2003311822 metadata/md5-cache/media-plugins/live-2018.07.07
 2003311822 metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
 2003311822 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
 2004020310 metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
@@ -54140,7 +54167,6 @@
 2004081909 metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.6
 2004091909 metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1-r1
 2004091909 metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
-2004202009 metadata/md5-cache/media-plugins/live-2017.10.28
 2004230939 metadata/md5-cache/media-plugins/live-2020.03.06
 2004260739 metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.1
 2004261539 metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
@@ -54381,8 +54407,9 @@
 2005102009 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
 2005102009 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
 2005121009 metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
-2005131209 metadata/md5-cache/media-plugins/Manifest.gz
 2005131209 metadata/md5-cache/media-plugins/gst-plugins-meta-1.16.2
+2005151539 metadata/md5-cache/media-plugins/Manifest.gz
+2005151539 metadata/md5-cache/media-plugins/gst-plugins-srt-1.16.2
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002081239 metadata/md5-cache/media-radio/xdx-2.5.0
@@ -55164,7 +55191,6 @@
 2004300915 metadata/md5-cache/media-video/handbrake-9999
 2004300915 metadata/md5-cache/media-video/mpv-0.32.0-r1
 2004300915 metadata/md5-cache/media-video/mpv-9999
-2004300915 metadata/md5-cache/media-video/obs-studio-9999
 2004300915 metadata/md5-cache/media-video/subdl-1.0.3
 2005011341 metadata/md5-cache/media-video/devedeng-4.15.0
 2005011341 metadata/md5-cache/media-video/devedeng-4.16.0
@@ -55201,19 +55227,23 @@
 2005102339 metadata/md5-cache/media-video/cheese-3.34.0-r1
 2005102009 metadata/md5-cache/media-video/clive-2.3.0.1
 2005102009 metadata/md5-cache/media-video/dvdrip-0.98.11-r4
-2005101509 metadata/md5-cache/media-video/obs-studio-25.0.8
 2005102339 metadata/md5-cache/media-video/peek-1.4.0-r1
 2005102339 metadata/md5-cache/media-video/peek-1.5.1
 2005102339 metadata/md5-cache/media-video/pipewire-0.2.7
 2005102339 metadata/md5-cache/media-video/pitivi-0.999-r2
 2005102339 metadata/md5-cache/media-video/totem-3.34.1
-2005102339 metadata/md5-cache/media-video/vlc-3.0.8-r1
 2005102339 metadata/md5-cache/media-video/vlc-3.0.9999
 2005102339 metadata/md5-cache/media-video/vlc-9999
-2005121909 metadata/md5-cache/media-video/Manifest.gz
 2005121009 metadata/md5-cache/media-video/pitivi-0.999-r3
 2005121339 metadata/md5-cache/media-video/transcode-1.1.7-r5
 2005121909 metadata/md5-cache/media-video/vlc-3.0.10-r1
+2005150839 metadata/md5-cache/media-video/Manifest.gz
+2005150839 metadata/md5-cache/media-video/mkvtoolnix-46.0.0
+2005141909 metadata/md5-cache/media-video/obs-studio-25.0.8-r1
+2005141909 metadata/md5-cache/media-video/obs-studio-9999
+2005141909 metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012
+2005141909 metadata/md5-cache/media-video/vidcutter-6.0.0
+2005141909 metadata/md5-cache/media-video/vidcutter-9999
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910111911 metadata/md5-cache/net-analyzer/bwping-1.15
@@ -55583,7 +55613,6 @@
 2003311822 metadata/md5-cache/net-analyzer/tcptrack-1.4.2
 2003311822 metadata/md5-cache/net-analyzer/thc-ipv6-3.2-r1
 2003311822 metadata/md5-cache/net-analyzer/thc-ipv6-9999
-2003311822 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
 2003311822 metadata/md5-cache/net-analyzer/tleds-1.05_beta11-r2
 2003311822 metadata/md5-cache/net-analyzer/tptest-3.1.7-r2
 2003311822 metadata/md5-cache/net-analyzer/tracebox-0.2
@@ -55597,8 +55626,6 @@
 2003311822 metadata/md5-cache/net-analyzer/yersinia-0.7.3
 2003311822 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2003311822 metadata/md5-cache/net-analyzer/zabbix-3.0.30
-2003311822 metadata/md5-cache/net-analyzer/zabbix-4.0.18
-2003311822 metadata/md5-cache/net-analyzer/zabbix-4.4.6
 2004020310 metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
 2004020310 metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
 2004020310 metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.0
@@ -55734,16 +55761,17 @@
 2005102009 metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
 2005102009 metadata/md5-cache/net-analyzer/symon-2.87
 2005111439 metadata/md5-cache/net-analyzer/testssl-3.0.2
-2005101739 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
 2005122309 metadata/md5-cache/net-analyzer/netdata-1.22.1
 2005121139 metadata/md5-cache/net-analyzer/zabbix-3.0.31
 2005121139 metadata/md5-cache/net-analyzer/zabbix-4.0.20
-2005131639 metadata/md5-cache/net-analyzer/Manifest.gz
 2005131109 metadata/md5-cache/net-analyzer/bwping-1.17
 2005131639 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
 2005130709 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
 2005131339 metadata/md5-cache/net-analyzer/zabbix-4.0.19
 2005131339 metadata/md5-cache/net-analyzer/zabbix-4.4.7
+2005141239 metadata/md5-cache/net-analyzer/Manifest.gz
+2005141239 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
+2005141239 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2003282328 metadata/md5-cache/net-dialup/dwun-0.96e-r4
@@ -55888,9 +55916,9 @@
 2005091109 metadata/md5-cache/net-dns/dnstop-20140915-r2
 2005102009 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2005102309 metadata/md5-cache/net-dns/pdns-4.3.0
-2005121009 metadata/md5-cache/net-dns/dnsmasq-2.81
-2005130339 metadata/md5-cache/net-dns/Manifest.gz
 2005130339 metadata/md5-cache/net-dns/ddclient-3.9.1
+2005140039 metadata/md5-cache/net-dns/Manifest.gz
+2005140039 metadata/md5-cache/net-dns/dnsmasq-2.81
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2003282328 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -55998,12 +56026,12 @@
 2005011341 metadata/md5-cache/net-fs/nfstest-2.1.2
 2005011341 metadata/md5-cache/net-fs/s3ql-2.33
 2005060439 metadata/md5-cache/net-fs/davfs2-1.5.6-r1
-2005061039 metadata/md5-cache/net-fs/samba-4.11.8
 2005061009 metadata/md5-cache/net-fs/samba-4.12.1
 2005061539 metadata/md5-cache/net-fs/samba-4.11.9
 2005061539 metadata/md5-cache/net-fs/samba-4.12.2
-2005102339 metadata/md5-cache/net-fs/Manifest.gz
 2005102339 metadata/md5-cache/net-fs/sshfs-3.7.0
+2005150039 metadata/md5-cache/net-fs/Manifest.gz
+2005150039 metadata/md5-cache/net-fs/samba-4.11.8
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
@@ -56084,9 +56112,7 @@
 2004300915 metadata/md5-cache/net-im/pidgin-2.13.0-r7
 2004300915 metadata/md5-cache/net-im/pidgin-2.13.0-r8
 2004300915 metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
-2004300915 metadata/md5-cache/net-im/spectrum2-2.0.12-r2
 2004300915 metadata/md5-cache/net-im/telegram-desktop-2.0.1-r1
-2004300915 metadata/md5-cache/net-im/telegram-desktop-2.1.0
 2004300915 metadata/md5-cache/net-im/telepathy-logger-0.8.2
 2004300915 metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
 2004300915 metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
@@ -56115,16 +56141,19 @@
 2005102009 metadata/md5-cache/net-im/gitter-bin-3.1.0
 2005102009 metadata/md5-cache/net-im/gitter-bin-4.1.0
 2005102009 metadata/md5-cache/net-im/sendxmpp-1.24
-2005102009 metadata/md5-cache/net-im/signal-desktop-bin-1.33.4
 2005102009 metadata/md5-cache/net-im/slack-4.3.2-r2
 2005102009 metadata/md5-cache/net-im/slack-4.4.2
 2005102009 metadata/md5-cache/net-im/teams-1.3.00.5153
 2005100009 metadata/md5-cache/net-im/telegram-desktop-2.1.4
-2005121239 metadata/md5-cache/net-im/Manifest.gz
 2005120109 metadata/md5-cache/net-im/ejabberd-17.04-r2
 2005120109 metadata/md5-cache/net-im/ejabberd-20.03
 2005120109 metadata/md5-cache/net-im/ejabberd-20.04
 2005121239 metadata/md5-cache/net-im/zoom-5.0.403652.0509
+2005150239 metadata/md5-cache/net-im/Manifest.gz
+2005150239 metadata/md5-cache/net-im/signal-desktop-bin-1.34.0
+2005141209 metadata/md5-cache/net-im/spectrum2-2.0.12-r2
+2005141639 metadata/md5-cache/net-im/telegram-desktop-2.1.0
+2005142009 metadata/md5-cache/net-im/telegram-desktop-2.1.6
 1805212239 metadata/md5-cache/net-irc/dccserver-0.5-r1
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1702282328 metadata/md5-cache/net-irc/nebula-0.5
@@ -56508,10 +56537,6 @@
 2004211009 metadata/md5-cache/net-libs/libnsl-1.2.0
 2004211009 metadata/md5-cache/net-libs/rpcsvc-proto-0
 2004221209 metadata/md5-cache/net-libs/gupnp-igd-0.2.5-r10
-2004221139 metadata/md5-cache/net-libs/srt-1.3.2-r1
-2004221139 metadata/md5-cache/net-libs/srt-1.4.0-r1
-2004221139 metadata/md5-cache/net-libs/srt-1.4.1-r1
-2004221139 metadata/md5-cache/net-libs/srt-9999
 2004242309 metadata/md5-cache/net-libs/grpc-1.28.1-r1
 2004250939 metadata/md5-cache/net-libs/quiche-0.1.0-r1
 2004250939 metadata/md5-cache/net-libs/quiche-0.2.0
@@ -56551,7 +56576,6 @@
 2004300915 metadata/md5-cache/net-libs/telepathy-qt-9999
 2004300915 metadata/md5-cache/net-libs/webkit-gtk-2.24.4
 2004300915 metadata/md5-cache/net-libs/webkit-gtk-2.26.4-r1
-2004300915 metadata/md5-cache/net-libs/webkit-gtk-2.28.1
 2004300915 metadata/md5-cache/net-libs/xrootd-4.11.1
 2004300915 metadata/md5-cache/net-libs/xrootd-4.8.3
 2005011341 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1
@@ -56600,12 +56624,18 @@
 2005102339 metadata/md5-cache/net-libs/libsoup-2.70.0
 2005102339 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2005102139 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
-2005121709 metadata/md5-cache/net-libs/libwebsockets-4.0.7
 2005112009 metadata/md5-cache/net-libs/mbedtls-2.22.0-r1
-2005132039 metadata/md5-cache/net-libs/Manifest.gz
 2005132039 metadata/md5-cache/net-libs/glib-networking-2.62.3
-2005131809 metadata/md5-cache/net-libs/libhubbub-0.3.6
-2005131639 metadata/md5-cache/net-libs/webkit-gtk-2.28.2
+2005151609 metadata/md5-cache/net-libs/Manifest.gz
+2005141109 metadata/md5-cache/net-libs/libhubbub-0.3.6
+2005140039 metadata/md5-cache/net-libs/libwebsockets-4.0.7
+2005140039 metadata/md5-cache/net-libs/srt-1.3.2-r1
+2005140039 metadata/md5-cache/net-libs/srt-1.4.0-r1
+2005150039 metadata/md5-cache/net-libs/srt-1.4.1-r1
+2005140039 metadata/md5-cache/net-libs/srt-9999
+2005150709 metadata/md5-cache/net-libs/wandio-4.2.3_p1
+2005150039 metadata/md5-cache/net-libs/webkit-gtk-2.28.2
+2005142009 metadata/md5-cache/net-libs/xrootd-4.12.1
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -56898,8 +56928,6 @@
 2003282328 metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
 2003282328 metadata/md5-cache/net-misc/lcr-9999
 2003282328 metadata/md5-cache/net-misc/liveice-2000530-r2
-2003282328 metadata/md5-cache/net-misc/memcached-1.6.2
-2003290509 metadata/md5-cache/net-misc/memcached-1.6.3
 2003282328 metadata/md5-cache/net-misc/mico-2.3.13-r13
 2003282328 metadata/md5-cache/net-misc/mico-2.3.13-r14
 2003282328 metadata/md5-cache/net-misc/mico-9999
@@ -57198,8 +57226,6 @@
 2004201339 metadata/md5-cache/net-misc/whois-5.5.6-r1
 2004201339 metadata/md5-cache/net-misc/whois-9999
 2004201739 metadata/md5-cache/net-misc/yandex-disk-0.1.5.978_p1
-2004211139 metadata/md5-cache/net-misc/asterisk-13.32.0-r1
-2004211139 metadata/md5-cache/net-misc/asterisk-16.9.0
 2004212039 metadata/md5-cache/net-misc/bridge-utils-1.5
 2004212109 metadata/md5-cache/net-misc/bridge-utils-1.6
 2004211009 metadata/md5-cache/net-misc/dhcpcd-7.2.3
@@ -57224,7 +57250,6 @@
 2004240439 metadata/md5-cache/net-misc/vde-2.3.2-r6
 2004240439 metadata/md5-cache/net-misc/vde-2.3.2_p20191011
 2004240439 metadata/md5-cache/net-misc/vde-9999
-2004252209 metadata/md5-cache/net-misc/freerdp-2.0.0-r1
 2004261539 metadata/md5-cache/net-misc/minidlna-1.2.1-r1
 2004271509 metadata/md5-cache/net-misc/icaclient-19.12.0.19
 2004271509 metadata/md5-cache/net-misc/icaclient-20.04.0.21
@@ -57312,7 +57337,6 @@
 2005042139 metadata/md5-cache/net-misc/cni-plugins-0.8.5
 2005051539 metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r1
 2005051639 metadata/md5-cache/net-misc/dropbox-97.3.451
-2005060109 metadata/md5-cache/net-misc/memcached-1.6.5
 2005050039 metadata/md5-cache/net-misc/nx-3.5.99.23
 2005062039 metadata/md5-cache/net-misc/bfgminer-5.4.2
 2005062039 metadata/md5-cache/net-misc/bfgminer-5.5.0
@@ -57372,8 +57396,6 @@
 2005121909 metadata/md5-cache/net-misc/freerdp-2.1.0
 2005112009 metadata/md5-cache/net-misc/openvswitch-2.13.0
 2005121009 metadata/md5-cache/net-misc/youtube-dl-2020.05.08
-2005132239 metadata/md5-cache/net-misc/Manifest.gz
-2005131439 metadata/md5-cache/net-misc/endlessh-1.1
 2005130609 metadata/md5-cache/net-misc/freerdp-2.9999
 2005132139 metadata/md5-cache/net-misc/geoipupdate-4.3.0
 2005132039 metadata/md5-cache/net-misc/ntp-4.2.8_p14-r2
@@ -57381,6 +57403,12 @@
 2005131909 metadata/md5-cache/net-misc/usbip-3.19
 2005131909 metadata/md5-cache/net-misc/usbip-4.13
 2005131439 metadata/md5-cache/net-misc/wget-1.20.3-r3
+2005150139 metadata/md5-cache/net-misc/Manifest.gz
+2005140139 metadata/md5-cache/net-misc/cni-plugins-0.8.6
+2005140139 metadata/md5-cache/net-misc/dropbox-97.4.467
+2005150039 metadata/md5-cache/net-misc/endlessh-1.1
+2005141039 metadata/md5-cache/net-misc/memcached-1.6.6
+2005140939 metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2002171109 metadata/md5-cache/net-nds/shelldap-1.5.0
@@ -57539,8 +57567,9 @@
 2005071739 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
 2005102009 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
 2005102009 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
-2005112009 metadata/md5-cache/net-p2p/Manifest.gz
 2005112009 metadata/md5-cache/net-p2p/retroshare-0.6.5
+2005142009 metadata/md5-cache/net-p2p/Manifest.gz
+2005142009 metadata/md5-cache/net-p2p/syncthing-1.5.0
 1808280009 metadata/md5-cache/net-print/c2esp-27
 1702282329 metadata/md5-cache/net-print/cups-bjnp-1.1
 1702282329 metadata/md5-cache/net-print/cups-bjnp-1.2.1
@@ -57609,9 +57638,10 @@
 2005102009 metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
 2005102009 metadata/md5-cache/net-print/hplip-plugin-3.19.12
 2005102009 metadata/md5-cache/net-print/hplip-plugin-3.20.2
-2005131339 metadata/md5-cache/net-print/Manifest.gz
 2005131339 metadata/md5-cache/net-print/cups-2.3.3-r1
 2005131339 metadata/md5-cache/net-print/cups-filters-1.27.4
+2005140039 metadata/md5-cache/net-print/Manifest.gz
+2005140039 metadata/md5-cache/net-print/cnijfilter2-5.80
 2002261340 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
 2003282328 metadata/md5-cache/net-proxy/3proxy-0.8.13
 2003282328 metadata/md5-cache/net-proxy/dnsproxy-1.17
@@ -57703,7 +57733,6 @@
 2003311822 metadata/md5-cache/net-vpn/pptpd-1.4.0-r2
 2003311822 metadata/md5-cache/net-vpn/strongswan-5.8.1
 2003311822 metadata/md5-cache/net-vpn/strongswan-5.8.2
-2003310609 metadata/md5-cache/net-vpn/tailscale-0.97_p45
 2003311822 metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
 2003311822 metadata/md5-cache/net-vpn/vpncwatch-1.8
 2003311822 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
@@ -57723,7 +57752,6 @@
 2004201909 metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
 2004201909 metadata/md5-cache/net-vpn/networkmanager-wireguard-9999
 2004211039 metadata/md5-cache/net-vpn/libreswan-3.31
-2004220439 metadata/md5-cache/net-vpn/tailscale-0.98_p0
 2004261739 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r2
 2004261739 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
 2004261409 metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
@@ -57741,11 +57769,12 @@
 2005040709 metadata/md5-cache/net-vpn/peervpn-0.044-r5
 2005070209 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200506
 2005101939 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.1
-2005110739 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200510
 2005121739 metadata/md5-cache/net-vpn/libreswan-3.32
-2005132039 metadata/md5-cache/net-vpn/Manifest.gz
-2005132039 metadata/md5-cache/net-vpn/ocserv-1.0.1
-2005132039 metadata/md5-cache/net-vpn/openconnect-8.09-r1
+2005150039 metadata/md5-cache/net-vpn/Manifest.gz
+2005150039 metadata/md5-cache/net-vpn/ocserv-1.0.1
+2005150039 metadata/md5-cache/net-vpn/openconnect-8.09-r1
+2005140739 metadata/md5-cache/net-vpn/tailscale-0.98_p0
+2005140339 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -57797,8 +57826,6 @@
 2003282328 metadata/md5-cache/net-wireless/rtl_power_fftw-9999
 2003282328 metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
 2003282328 metadata/md5-cache/net-wireless/srslte-19.09
-2003282328 metadata/md5-cache/net-wireless/unifi-5.12.35
-2003282328 metadata/md5-cache/net-wireless/unifi-5.12.66
 2003282328 metadata/md5-cache/net-wireless/unifi-5.6.42-r1
 2003282328 metadata/md5-cache/net-wireless/wavemon-0.8.0
 2003282328 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
@@ -57869,7 +57896,6 @@
 2004220139 metadata/md5-cache/net-wireless/hostapd-9999
 2004211909 metadata/md5-cache/net-wireless/rtl_433-20.02_p20200321
 2004211909 metadata/md5-cache/net-wireless/rtl_433-9999
-2004211809 metadata/md5-cache/net-wireless/unifi-5.13.18
 2004282039 metadata/md5-cache/net-wireless/rtl-sdr-9999
 2004300915 metadata/md5-cache/net-wireless/airpwn-1.4-r2
 2004300915 metadata/md5-cache/net-wireless/blueberry-1.3.6
@@ -57950,9 +57976,10 @@
 2005061909 metadata/md5-cache/net-wireless/unifi-5.13.22
 2005102339 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.1
 2005102009 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
-2005121639 metadata/md5-cache/net-wireless/unifi-5.12.72
-2005131209 metadata/md5-cache/net-wireless/Manifest.gz
 2005131209 metadata/md5-cache/net-wireless/blueman-2.1.3
+2005151709 metadata/md5-cache/net-wireless/Manifest.gz
+2005151709 metadata/md5-cache/net-wireless/unifi-5.12.72
+2005141539 metadata/md5-cache/net-wireless/unifi-5.13.26
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -58436,7 +58463,6 @@
 2004020310 metadata/md5-cache/sci-biology/bamtools-2.5.1
 2004020310 metadata/md5-cache/sci-biology/bamtools-9999
 2004221239 metadata/md5-cache/sci-biology/mafft-7.305
-2004250039 metadata/md5-cache/sci-biology/foldingathome-7.6.9
 2004300915 metadata/md5-cache/sci-biology/amos-3.1.0-r4
 2004300915 metadata/md5-cache/sci-biology/bcftools-1.5
 2004300915 metadata/md5-cache/sci-biology/bcftools-1.9-r2
@@ -58456,7 +58482,6 @@
 2005011341 metadata/md5-cache/sci-biology/biopython-1.73
 2005011341 metadata/md5-cache/sci-biology/pysam-0.12.0.1
 2005102009 metadata/md5-cache/sci-biology/GBrowse-2.48-r1
-2005102009 metadata/md5-cache/sci-biology/Manifest.gz
 2005102009 metadata/md5-cache/sci-biology/bioperl-1.6.9
 2005102009 metadata/md5-cache/sci-biology/bioperl-db-1.6.9
 2005102009 metadata/md5-cache/sci-biology/bioperl-network-1.6.9
@@ -58464,6 +58489,8 @@
 2005102009 metadata/md5-cache/sci-biology/diya-1.0_rc4
 2005102009 metadata/md5-cache/sci-biology/vienna-rna-2.1.1
 2005102009 metadata/md5-cache/sci-biology/vienna-rna-2.1.8
+2005141809 metadata/md5-cache/sci-biology/Manifest.gz
+2005141809 metadata/md5-cache/sci-biology/foldingathome-7.6.13
 1812231809 metadata/md5-cache/sci-calculators/datamash-1.4
 1909181309 metadata/md5-cache/sci-calculators/datamash-1.5
 1702282330 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
@@ -58527,8 +58554,6 @@
 2003311822 metadata/md5-cache/sci-chemistry/easychem-0.6-r1
 2003311822 metadata/md5-cache/sci-chemistry/gperiodic-2.0.10-r2
 2003311822 metadata/md5-cache/sci-chemistry/gperiodic-3.0.1
-2003311822 metadata/md5-cache/sci-chemistry/gromacs-2018.8
-2003311822 metadata/md5-cache/sci-chemistry/gromacs-2018.9999
 2003311822 metadata/md5-cache/sci-chemistry/mm-align-20120321
 2003311822 metadata/md5-cache/sci-chemistry/molden-5.5
 2003311822 metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
@@ -58584,9 +58609,6 @@
 2004300915 metadata/md5-cache/sci-chemistry/freeon-1.0.10
 2004300915 metadata/md5-cache/sci-chemistry/freeon-1.0.8-r1
 2004300915 metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1
-2004300915 metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
-2004300915 metadata/md5-cache/sci-chemistry/gromacs-2019.6
-2004300915 metadata/md5-cache/sci-chemistry/gromacs-2019.9999
 2004300915 metadata/md5-cache/sci-chemistry/hollow-1.2-r1
 2004300915 metadata/md5-cache/sci-chemistry/molequeue-0.9.0
 2004300915 metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
@@ -58628,13 +58650,15 @@
 2005011341 metadata/md5-cache/sci-chemistry/propka-3.1_p140511
 2005011341 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
 2005011341 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
-2005121709 metadata/md5-cache/sci-chemistry/Manifest.gz
 2005121709 metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
 2005121709 metadata/md5-cache/sci-chemistry/gromacs-2020.2
+2005141709 metadata/md5-cache/sci-chemistry/Manifest.gz
+2005141709 metadata/md5-cache/sci-chemistry/gromacs-2018.8
+2005141709 metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
+2005141709 metadata/md5-cache/sci-chemistry/gromacs-2019.6
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1801270108 metadata/md5-cache/sci-electronics/iverilog-10.2
-1901022009 metadata/md5-cache/sci-electronics/kicad-meta-5.0.1
 1904072009 metadata/md5-cache/sci-electronics/kicad-meta-5.1.0
 1906041609 metadata/md5-cache/sci-electronics/kicad-meta-5.1.2
 1908101439 metadata/md5-cache/sci-electronics/kicad-meta-5.1.4
@@ -58681,11 +58705,6 @@
 2003311822 metadata/md5-cache/sci-electronics/irsim-9.7.93
 2003311822 metadata/md5-cache/sci-electronics/iverilog-0.9.6
 2003311822 metadata/md5-cache/sci-electronics/iverilog-0.9.7
-2003311822 metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1
-2003311822 metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
-2003311822 metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
-2003311822 metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1
-2003311822 metadata/md5-cache/sci-electronics/kicad-templates-5.0.1
 2003311822 metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
 2003311822 metadata/md5-cache/sci-electronics/linsmith-0.99.31
 2003311822 metadata/md5-cache/sci-electronics/magic-7.5.202-r1
@@ -58734,10 +58753,6 @@
 2004261109 metadata/md5-cache/sci-electronics/gazebo-10.1.0
 2004300915 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
 2004300915 metadata/md5-cache/sci-electronics/kicad-4.0.7-r1
-2004300915 metadata/md5-cache/sci-electronics/kicad-5.0.1
-2004300915 metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
-2004300915 metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
-2004300915 metadata/md5-cache/sci-electronics/kicad-5.1.4
 2004300915 metadata/md5-cache/sci-electronics/klayout-9999
 2004300915 metadata/md5-cache/sci-electronics/pulseview-0.4.1-r1
 2004300915 metadata/md5-cache/sci-electronics/pulseview-9999
@@ -58745,8 +58760,11 @@
 2004300915 metadata/md5-cache/sci-electronics/sigrok-cli-9999
 2005070039 metadata/md5-cache/sci-electronics/klayout-0.26.4-r1
 2005070039 metadata/md5-cache/sci-electronics/klayout-0.26.5
-2005102109 metadata/md5-cache/sci-electronics/Manifest.gz
-2005102109 metadata/md5-cache/sci-electronics/kicad-5.1.5-r1
+2005141409 metadata/md5-cache/sci-electronics/Manifest.gz
+2005141409 metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
+2005141409 metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
+2005141409 metadata/md5-cache/sci-electronics/kicad-5.1.4
+2005141409 metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
 1902211339 metadata/md5-cache/sci-geosciences/gdal-grass-2.1.3
 1805212239 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
 1902251809 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
@@ -59451,9 +59469,10 @@
 2004300915 metadata/md5-cache/sci-mathematics/slepc-3.13.1
 2004300915 metadata/md5-cache/sci-mathematics/z3-4.8.6
 2005011341 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
-2005011341 metadata/md5-cache/sci-mathematics/pymc3-3.1
-2005110108 metadata/md5-cache/sci-mathematics/Manifest.gz
 2005110108 metadata/md5-cache/sci-mathematics/petsc-3.13.1
+2005141409 metadata/md5-cache/sci-mathematics/Manifest.gz
+2005141409 metadata/md5-cache/sci-mathematics/pymc3-3.1-r1
+2005140939 metadata/md5-cache/sci-mathematics/z3-4.8.8
 1702282331 metadata/md5-cache/sci-misc/ViSP-images-3.0.1
 1712082209 metadata/md5-cache/sci-misc/ViSP-images-3.1.0
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
@@ -60951,7 +60970,6 @@
 2005071739 metadata/md5-cache/sys-apps/ipmiutil-3.1.6
 2005081846 metadata/md5-cache/sys-apps/irqbalance-1.6.0
 2005071739 metadata/md5-cache/sys-apps/less-560
-2005091709 metadata/md5-cache/sys-apps/moreutils-0.63
 2005071739 metadata/md5-cache/sys-apps/pkgcore-0.10.12
 2005071739 metadata/md5-cache/sys-apps/pkgcore-9999
 2005081846 metadata/md5-cache/sys-apps/portage-2.3.99-r2
@@ -60980,8 +60998,9 @@
 2005121309 metadata/md5-cache/sys-apps/less-561
 2005121009 metadata/md5-cache/sys-apps/lm-sensors-3.6.0
 2005121539 metadata/md5-cache/sys-apps/netloc-0.5
-2005132039 metadata/md5-cache/sys-apps/Manifest.gz
 2005132039 metadata/md5-cache/sys-apps/ethtool-5.4
+2005140039 metadata/md5-cache/sys-apps/Manifest.gz
+2005140039 metadata/md5-cache/sys-apps/moreutils-0.63
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 2001012339 metadata/md5-cache/sys-auth/pam_mount-2.16
@@ -61075,8 +61094,9 @@
 2005102339 metadata/md5-cache/sys-auth/libfprint-1.90.0
 2005102339 metadata/md5-cache/sys-auth/libfprint-1.90.1
 2005102339 metadata/md5-cache/sys-auth/rtkit-0.13-r1
-2005132039 metadata/md5-cache/sys-auth/Manifest.gz
 2005132039 metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
+2005140209 metadata/md5-cache/sys-auth/Manifest.gz
+2005140209 metadata/md5-cache/sys-auth/keystone-16.0.1
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -61402,10 +61422,6 @@
 2003311822 metadata/md5-cache/sys-cluster/projections-6.2.1
 2003311822 metadata/md5-cache/sys-cluster/resource-agents-3.9.6
 2003311822 metadata/md5-cache/sys-cluster/resource-agents-4.0.1
-2003311822 metadata/md5-cache/sys-cluster/slurm-19.05.4.1
-2003311822 metadata/md5-cache/sys-cluster/slurm-19.05.5.1
-2003311822 metadata/md5-cache/sys-cluster/slurm-20.02.0.1
-2003311822 metadata/md5-cache/sys-cluster/slurm-20.02.1.1
 2003311822 metadata/md5-cache/sys-cluster/spark-bin-2.3.1-r1
 2003311822 metadata/md5-cache/sys-cluster/torque-4.2.10-r1
 2003311822 metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -61512,9 +61528,18 @@
 2005081846 metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
 2005081846 metadata/md5-cache/sys-cluster/ucx-1.3.0
 2005081846 metadata/md5-cache/sys-cluster/ucx-1.5.2
-2005110939 metadata/md5-cache/sys-cluster/Manifest.gz
 2005092339 metadata/md5-cache/sys-cluster/glusterfs-7.5
 2005110939 metadata/md5-cache/sys-cluster/rdma-core-28.0
+2005141909 metadata/md5-cache/sys-cluster/Manifest.gz
+2005141909 metadata/md5-cache/sys-cluster/kube-apiserver-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kube-proxy-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kube-scheduler-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kubeadm-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kubectl-1.15.12
+2005141909 metadata/md5-cache/sys-cluster/kubelet-1.15.12
+2005140139 metadata/md5-cache/sys-cluster/minikube-1.10.1
+2005141739 metadata/md5-cache/sys-cluster/slurm-20.02.2.1
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1910111911 metadata/md5-cache/sys-devel/llvm-common-8.0.1
 1909170139 metadata/md5-cache/sys-devel/llvmgold-8
@@ -61522,7 +61547,6 @@
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.5
 2001182039 metadata/md5-cache/sys-devel/llvmgold-11
-2001282139 metadata/md5-cache/sys-devel/bmake-20181221
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
 2002112051 metadata/md5-cache/sys-devel/llvm-common-10.0.0.9999
 2002112051 metadata/md5-cache/sys-devel/llvm-common-11.0.0.9999
@@ -61671,7 +61695,6 @@
 2005072109 metadata/md5-cache/sys-devel/clang-10.0.0.9999
 2005072109 metadata/md5-cache/sys-devel/clang-11.0.0.9999
 2005072109 metadata/md5-cache/sys-devel/clang-9.0.1
-2005110139 metadata/md5-cache/sys-devel/Manifest.gz
 2005102139 metadata/md5-cache/sys-devel/binutils-2.34-r1
 2005110139 metadata/md5-cache/sys-devel/bison-3.6.1
 2005100409 metadata/md5-cache/sys-devel/gcc-10.1.0
@@ -61724,6 +61747,8 @@
 2005100409 metadata/md5-cache/sys-devel/kgcc64-9.1.0
 2005100409 metadata/md5-cache/sys-devel/kgcc64-9.2.0
 2005100409 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
+2005151239 metadata/md5-cache/sys-devel/Manifest.gz
+2005151239 metadata/md5-cache/sys-devel/bmake-20200318
 2003282328 metadata/md5-cache/sys-fabric/mstflint-4.10.0_p3
 2003282328 metadata/md5-cache/sys-fabric/mstflint-4.11.0_p5
 2003282328 metadata/md5-cache/sys-fabric/mstflint-4.13.3_p2
@@ -61917,7 +61942,6 @@
 2003282328 metadata/md5-cache/sys-fs/snapraid-11.3
 2003282328 metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
 2003282328 metadata/md5-cache/sys-fs/squashfuse-0.1.103
-2003282328 metadata/md5-cache/sys-fs/treesize-0.54.1-r1
 2003282328 metadata/md5-cache/sys-fs/udftools-2.2
 2003282328 metadata/md5-cache/sys-fs/vzquota-3.1
 2003282328 metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
@@ -62034,7 +62058,6 @@
 2004300915 metadata/md5-cache/sys-fs/zfs-0.7.13-r1
 2004300915 metadata/md5-cache/sys-fs/zfs-0.7.13-r2
 2005011341 metadata/md5-cache/sys-fs/cryptsetup-1.7.5-r1
-2005011639 metadata/md5-cache/sys-fs/cryptsetup-2.3.2
 2005011409 metadata/md5-cache/sys-fs/fatsort-1.5.0
 2005011409 metadata/md5-cache/sys-fs/fatsort-1.6.2.605
 2005011341 metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
@@ -62050,7 +62073,6 @@
 2005051309 metadata/md5-cache/sys-fs/squashfs-tools-9999
 2005040040 metadata/md5-cache/sys-fs/squashfs-tools-ng-0.9.1
 2005060009 metadata/md5-cache/sys-fs/xfsdump-3.1.9
-2005060609 metadata/md5-cache/sys-fs/zfs-kmod-9999
 2005090339 metadata/md5-cache/sys-fs/btrfs-progs-5.6.1
 2005081846 metadata/md5-cache/sys-fs/udiskie-2.2.0
 2005102009 metadata/md5-cache/sys-fs/ddrescue-1.24
@@ -62064,10 +62086,14 @@
 2005102339 metadata/md5-cache/sys-fs/udev-245
 2005102339 metadata/md5-cache/sys-fs/udev-9999
 2005112139 metadata/md5-cache/sys-fs/mtd-utils-2.0.2
-2005130209 metadata/md5-cache/sys-fs/Manifest.gz
 2005130209 metadata/md5-cache/sys-fs/zfs-0.8.4
 2005130209 metadata/md5-cache/sys-fs/zfs-9999
-2005130209 metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
+2005151709 metadata/md5-cache/sys-fs/Manifest.gz
+2005151709 metadata/md5-cache/sys-fs/cryptsetup-2.3.2
+2005151709 metadata/md5-cache/sys-fs/lxcfs-4.0.3
+2005151009 metadata/md5-cache/sys-fs/treesize-0.54.1-r1
+2005150709 metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
+2005150709 metadata/md5-cache/sys-fs/zfs-kmod-9999
 1803241538 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
@@ -62117,7 +62143,6 @@
 2005082322 metadata/md5-cache/sys-kernel/linux-docs-5.4.39
 2005071539 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.39
 2005071539 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.11
-2005132009 metadata/md5-cache/sys-kernel/Manifest.gz
 2005131909 metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
 2005131909 metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
 2005131909 metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
@@ -62208,31 +62233,36 @@
 2005131909 metadata/md5-cache/sys-kernel/pf-sources-5.6_p6
 2005131909 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
 2005131909 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5
-2005131909 metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3
 2005131439 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
 2005131439 metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.12
 2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-3.16.83
 2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.180
-2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.122
 2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.223
 2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.223
-2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.40
 2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-5.5.18
-2005131909 metadata/md5-cache/sys-kernel/vanilla-sources-5.6.12
 2005131909 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
 2005131909 metadata/md5-cache/sys-kernel/zen-sources-5.4.15
 2005131909 metadata/md5-cache/sys-kernel/zen-sources-5.5.13
 2005131909 metadata/md5-cache/sys-kernel/zen-sources-5.6.9
+2005151809 metadata/md5-cache/sys-kernel/Manifest.gz
+2005141639 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.123
+2005141639 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.41
+2005141639 metadata/md5-cache/sys-kernel/gentoo-sources-5.6.13
+2005150839 metadata/md5-cache/sys-kernel/pf-sources-5.6_p7
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.14.170_p75
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.19.120_p52
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.19.94_p38
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.4.215_p192
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.4.220_p196
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.9.215_p138
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-4.9.220_p143
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-5.4.13_p7
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-5.4.34_p21
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-5.6.10_p5
+2005151809 metadata/md5-cache/sys-kernel/rt-sources-5.6.4_p3
+2005141239 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.123
+2005141239 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.41
+2005141239 metadata/md5-cache/sys-kernel/vanilla-sources-5.6.13
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1901251639 metadata/md5-cache/sys-libs/freeipmi-1.6.3
@@ -62407,7 +62437,6 @@
 2005011239 metadata/md5-cache/sys-libs/tapi-2.0.0
 2005021509 metadata/md5-cache/sys-libs/gdbm-1.18.1
 2005031409 metadata/md5-cache/sys-libs/glibc-2.31-r2
-2005061039 metadata/md5-cache/sys-libs/ldb-2.0.10
 2005051139 metadata/md5-cache/sys-libs/libcap-2.34
 2005060109 metadata/md5-cache/sys-libs/libcxx-10.0.0
 2005060109 metadata/md5-cache/sys-libs/libcxx-10.0.0.9999
@@ -62435,9 +62464,10 @@
 2005122209 metadata/md5-cache/sys-libs/libblockdev-2.23-r1
 2005121339 metadata/md5-cache/sys-libs/librtas-2.0.2-r1
 2005112009 metadata/md5-cache/sys-libs/ncurses-6.2-r1
-2005130009 metadata/md5-cache/sys-libs/Manifest.gz
 2005130009 metadata/md5-cache/sys-libs/glibc-2.31-r3
-2005130009 metadata/md5-cache/sys-libs/glibc-9999
+2005150039 metadata/md5-cache/sys-libs/Manifest.gz
+2005141509 metadata/md5-cache/sys-libs/glibc-9999
+2005150039 metadata/md5-cache/sys-libs/ldb-2.0.10
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -62846,8 +62876,8 @@
 2005091739 metadata/md5-cache/virtual/gnustep-back-0.28.0
 2005081846 metadata/md5-cache/virtual/rust-1.43.1
 2005110709 metadata/md5-cache/virtual/notification-daemon-0
-2005121609 metadata/md5-cache/virtual/Manifest.gz
-2005121609 metadata/md5-cache/virtual/opencl-3-r1
+2005150039 metadata/md5-cache/virtual/Manifest.gz
+2005150039 metadata/md5-cache/virtual/opencl-3-r1
 1907262139 metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
 1909061809 metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
 1808151104 metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r1
@@ -62868,7 +62898,6 @@
 2003282328 metadata/md5-cache/www-apache/mod_gnutls-0.8.4
 2003282328 metadata/md5-cache/www-apache/mod_gnutls-0.9.0
 2003282328 metadata/md5-cache/www-apache/mod_h2-1.15.7
-2003282328 metadata/md5-cache/www-apache/mod_h2-9999
 2003282328 metadata/md5-cache/www-apache/mod_ldap_userdir-1.1.19
 2003282328 metadata/md5-cache/www-apache/mod_limitipconn-0.24-r3
 2003282328 metadata/md5-cache/www-apache/mod_log_rotate-1.01
@@ -62904,8 +62933,10 @@
 2004300915 metadata/md5-cache/www-apache/mod_wsgi-4.6.5
 2005091109 metadata/md5-cache/www-apache/mod_wsgi-4.7.0
 2005102009 metadata/md5-cache/www-apache/libapreq2-2.13-r1
-2005122109 metadata/md5-cache/www-apache/Manifest.gz
 2005112009 metadata/md5-cache/www-apache/mod_perl-2.0.11
+2005151639 metadata/md5-cache/www-apache/Manifest.gz
+2005151639 metadata/md5-cache/www-apache/mod_h2-1.15.9
+2005151639 metadata/md5-cache/www-apache/mod_h2-9999
 1903221339 metadata/md5-cache/www-apps/airdcpp-webui-2.6.0
 1905211209 metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
 1906051110 metadata/md5-cache/www-apps/cgp-1_p20181209
@@ -63128,11 +63159,6 @@
 2005102339 metadata/md5-cache/www-client/epiphany-3.32.6
 2005102339 metadata/md5-cache/www-client/epiphany-3.34.4
 2005102009 metadata/md5-cache/www-client/google-chrome-81.0.4044.138
-2005102009 metadata/md5-cache/www-client/opera-68.0.3618.63-r1
-2005102009 metadata/md5-cache/www-client/opera-beta-68.0.3618.45
-2005102009 metadata/md5-cache/www-client/opera-beta-68.0.3618.55
-2005102009 metadata/md5-cache/www-client/opera-developer-69.0.3673.0
-2005102009 metadata/md5-cache/www-client/opera-developer-69.0.3679.0
 2005111709 metadata/md5-cache/www-client/opera-developer-69.0.3686.0
 2005102009 metadata/md5-cache/www-client/vivaldi-3.0.1874.38_p1
 2005102009 metadata/md5-cache/www-client/vivaldi-snapshot-3.1.1906.3_p1
@@ -63143,8 +63169,9 @@
 2005121709 metadata/md5-cache/www-client/qutebrowser-1.11.1
 2005121709 metadata/md5-cache/www-client/qutebrowser-9999
 2005112009 metadata/md5-cache/www-client/seamonkey-2.53.2
-2005131939 metadata/md5-cache/www-client/Manifest.gz
-2005131939 metadata/md5-cache/www-client/opera-68.0.3618.104
+2005141639 metadata/md5-cache/www-client/Manifest.gz
+2005141639 metadata/md5-cache/www-client/opera-68.0.3618.104
+2005141639 metadata/md5-cache/www-client/opera-beta-69.0.3686.2
 1808151104 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -63176,10 +63203,10 @@
 2005011341 metadata/md5-cache/www-misc/urlwatch-2.17
 2005042039 metadata/md5-cache/www-misc/monitorix-3.11.0
 2005101339 metadata/md5-cache/www-misc/urlwatch-2.18-r1
-2005132039 metadata/md5-cache/www-misc/Manifest.gz
 2005122339 metadata/md5-cache/www-misc/awstats-7.4
-2005132039 metadata/md5-cache/www-misc/awstats-7.8
 2005131309 metadata/md5-cache/www-misc/awstats-7.8-r1
+2005150039 metadata/md5-cache/www-misc/Manifest.gz
+2005150039 metadata/md5-cache/www-misc/awstats-7.8
 1712242039 metadata/md5-cache/www-plugins/pdfjs-1.9.426
 1909260009 metadata/md5-cache/www-plugins/pdfjs-2.1.266
 2001040209 metadata/md5-cache/www-plugins/passff-1.9.1
@@ -63230,7 +63257,6 @@
 2004032241 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2004120039 metadata/md5-cache/www-servers/nginx-1.16.1-r1
 2004101109 metadata/md5-cache/www-servers/tomcat-9.0.34
-2004192139 metadata/md5-cache/www-servers/tomcat-8.5.53
 2004201339 metadata/md5-cache/www-servers/tomcat-7.0.103
 2004300915 metadata/md5-cache/www-servers/cherokee-1.2.104-r2
 2004300039 metadata/md5-cache/www-servers/nginx-1.17.10-r1
@@ -63246,7 +63272,6 @@
 2005011341 metadata/md5-cache/www-servers/tornado-4.5.3
 2005011341 metadata/md5-cache/www-servers/tornado-5.1-r1
 2005011341 metadata/md5-cache/www-servers/tornado-6.0.3
-2005031609 metadata/md5-cache/www-servers/tornado-6.0.4
 2005071639 metadata/md5-cache/www-servers/nginx-unit-1.17.0
 2005072109 metadata/md5-cache/www-servers/varnish-6.0.1
 2005072109 metadata/md5-cache/www-servers/varnish-6.1.1
@@ -63254,9 +63279,10 @@
 2005112009 metadata/md5-cache/www-servers/uwsgi-2.0.17
 2005112009 metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
 2005112009 metadata/md5-cache/www-servers/uwsgi-2.0.18
-2005131209 metadata/md5-cache/www-servers/Manifest.gz
 2005131139 metadata/md5-cache/www-servers/tomcat-8.5.55
 2005131209 metadata/md5-cache/www-servers/tomcat-9.0.35
+2005141009 metadata/md5-cache/www-servers/Manifest.gz
+2005140209 metadata/md5-cache/www-servers/tornado-6.0.4
 2003282328 metadata/md5-cache/x11-apps/amlc-0.5.1
 2003282328 metadata/md5-cache/x11-apps/fonttosfnt-1.1.0
 2003282328 metadata/md5-cache/x11-apps/listres-1.0.4
@@ -63377,14 +63403,13 @@
 2003292339 metadata/md5-cache/x11-base/xorg-server-1.20.8
 2004032241 metadata/md5-cache/x11-base/xorg-server-1.20.7
 2004032241 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
-2004300915 metadata/md5-cache/x11-base/xcb-proto-1.13
 2004300915 metadata/md5-cache/x11-base/xcb-proto-1.14-r1
 2005031239 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2005031239 metadata/md5-cache/x11-base/xorg-drivers-9999
-2005102339 metadata/md5-cache/x11-base/Manifest.gz
 2005102339 metadata/md5-cache/x11-base/xorg-proto-2019.2
 2005102339 metadata/md5-cache/x11-base/xorg-proto-2020.1
 2005102339 metadata/md5-cache/x11-base/xorg-proto-9999
+2005150039 metadata/md5-cache/x11-base/Manifest.gz
 1907282239 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2003282328 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
 2003282328 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20
@@ -63587,13 +63612,11 @@
 2004300915 metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
 2004300915 metadata/md5-cache/x11-libs/goocanvas-2.0.4
 2004300039 metadata/md5-cache/x11-libs/gtk+-3.24.20
-2004300915 metadata/md5-cache/x11-libs/libxcb-1.13.1
 2004300915 metadata/md5-cache/x11-libs/libxcb-1.14
 2004300915 metadata/md5-cache/x11-libs/vte-0.28.2-r208
 2005020839 metadata/md5-cache/x11-libs/libgxim-0.5.0
 2005062039 metadata/md5-cache/x11-libs/motif-2.3.8-r1
 2005071739 metadata/md5-cache/x11-libs/libva-2.7.0
-2005102339 metadata/md5-cache/x11-libs/Manifest.gz
 2005102339 metadata/md5-cache/x11-libs/gdk-pixbuf-2.40.0
 2005102339 metadata/md5-cache/x11-libs/gtksourceview-4.4.0
 2005102339 metadata/md5-cache/x11-libs/libdrm-2.4.100
@@ -63611,6 +63634,8 @@
 2005102339 metadata/md5-cache/x11-libs/pixman-9999
 2005102339 metadata/md5-cache/x11-libs/vte-0.58.3
 2005102339 metadata/md5-cache/x11-libs/xapps-1.4.2
+2005150039 metadata/md5-cache/x11-libs/Manifest.gz
+2005141539 metadata/md5-cache/x11-libs/libva-2.7.1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -63636,7 +63661,6 @@
 1908011609 metadata/md5-cache/x11-misc/splatmoji-9999
 1805220439 metadata/md5-cache/x11-misc/stalonetray-0.8.3
 1706300138 metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
-1911092309 metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
 1703211738 metadata/md5-cache/x11-misc/wininfo-0.7-r1
 1907291609 metadata/md5-cache/x11-misc/wmctrl-1.07-r2
 1805220439 metadata/md5-cache/x11-misc/xautomation-1.09-r1
@@ -63800,7 +63824,6 @@
 2003282328 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2
 2003282328 metadata/md5-cache/x11-misc/xbatt-1.3_rc1
 2003282328 metadata/md5-cache/x11-misc/xbattbar-1.4.9
-2003282328 metadata/md5-cache/x11-misc/xcalendar-4.0-r2
 2003282328 metadata/md5-cache/x11-misc/xcape-1.2
 2003282328 metadata/md5-cache/x11-misc/xcave-2.4.0
 2003282328 metadata/md5-cache/x11-misc/xcave-2.5.1
@@ -63899,7 +63922,6 @@
 2003311822 metadata/md5-cache/x11-misc/xdialog-2.3.1
 2003311822 metadata/md5-cache/x11-misc/xdock-0.3.0
 2003311822 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
-2003311822 metadata/md5-cache/x11-misc/xearth-1.1-r1
 2003311822 metadata/md5-cache/x11-misc/xfe-1.42
 2003311822 metadata/md5-cache/x11-misc/xhkeys-2.2.1
 2003311822 metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
@@ -63976,7 +63998,6 @@
 2004080010 metadata/md5-cache/x11-misc/spacefm-1.0.6
 2004080010 metadata/md5-cache/x11-misc/spacefm-9999
 2004080010 metadata/md5-cache/x11-misc/synergy-1.9.1
-2004080010 metadata/md5-cache/x11-misc/synergy-2.0.0
 2004080010 metadata/md5-cache/x11-misc/tint2-16.2
 2004080010 metadata/md5-cache/x11-misc/tint2-16.6
 2004080010 metadata/md5-cache/x11-misc/tint2-16.6.1
@@ -64061,8 +64082,12 @@
 2005102339 metadata/md5-cache/x11-misc/picom-9999
 2005102309 metadata/md5-cache/x11-misc/projecteur-0.7-r2
 2005111139 metadata/md5-cache/x11-misc/xlockmore-5.63
-2005112009 metadata/md5-cache/x11-misc/Manifest.gz
 2005112009 metadata/md5-cache/x11-misc/menumaker-0.99.11
+2005150139 metadata/md5-cache/x11-misc/Manifest.gz
+2005150139 metadata/md5-cache/x11-misc/synergy-2.0.0
+2005150139 metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
+2005150139 metadata/md5-cache/x11-misc/xcalendar-4.0-r2
+2005150139 metadata/md5-cache/x11-misc/xearth-1.1-r1
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -64377,13 +64402,10 @@
 1912111540 metadata/md5-cache/x11-themes/gentoo10-backgrounds-20110309
 1912111540 metadata/md5-cache/x11-themes/larry-backgrounds-20110822-r1
 1912221309 metadata/md5-cache/x11-themes/gkrellm-themes-0.1-r1
-1912241509 metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
 1912241509 metadata/md5-cache/x11-themes/gtk-engines-nodoka-0.7.5
-1912241509 metadata/md5-cache/x11-themes/human-icon-theme-0.36
 1912241509 metadata/md5-cache/x11-themes/nuvox-07.1-r1
 1912241509 metadata/md5-cache/x11-themes/tactile-0_pre20060612
 1912241509 metadata/md5-cache/x11-themes/tactile3-3.1
-1912241509 metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
 1912241609 metadata/md5-cache/x11-themes/vdr-channel-logos-0.2-r2
 1912310209 metadata/md5-cache/x11-themes/experience-3.04-r1
 2002112051 metadata/md5-cache/x11-themes/claws-mail-themes-20140629
@@ -64408,7 +64430,6 @@
 2003282328 metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5
 2003282328 metadata/md5-cache/x11-themes/gtk-engines-quartz-0.2
 2003282328 metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
-2003282328 metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
 2003282328 metadata/md5-cache/x11-themes/nimbus-0.1.7-r1
 2003282328 metadata/md5-cache/x11-themes/numix-gtk-theme-2.6.7-r1
 2003282328 metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
@@ -64514,12 +64535,16 @@
 2005062209 metadata/md5-cache/x11-themes/fedora-backgrounds-32.2.2
 2005081846 metadata/md5-cache/x11-themes/mate-icon-theme-1.22.2
 2005081846 metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.20.0
-2005102339 metadata/md5-cache/x11-themes/Manifest.gz
 2005101409 metadata/md5-cache/x11-themes/arc-theme-20200502
 2005102339 metadata/md5-cache/x11-themes/gnome-backgrounds-3.34.0
 2005102339 metadata/md5-cache/x11-themes/greybird-3.22.11
 2005102339 metadata/md5-cache/x11-themes/greybird-9999
 2005102009 metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
+2005150139 metadata/md5-cache/x11-themes/Manifest.gz
+2005150139 metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
+2005150139 metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+2005150139 metadata/md5-cache/x11-themes/human-icon-theme-0.36
+2005150139 metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
 1908192239 metadata/md5-cache/x11-wm/e16-1.0.20
 1805240409 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 1912220239 metadata/md5-cache/x11-wm/e16-1.0.21
@@ -64601,7 +64626,6 @@
 2003311822 metadata/md5-cache/x11-wm/xmonad-contrib-0.15
 2004020310 metadata/md5-cache/x11-wm/ctwm-4.0.3
 2004032241 metadata/md5-cache/x11-wm/blackbox-0.70.1-r1
-2004032241 metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
 2004032241 metadata/md5-cache/x11-wm/twm-1.0.10
 2004062109 metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
 2004062109 metadata/md5-cache/x11-wm/ratpoison-1.4.9
@@ -64640,8 +64664,10 @@
 2005102009 metadata/md5-cache/x11-wm/icewm-1.6.5
 2005102339 metadata/md5-cache/x11-wm/mutter-3.34.5
 2005102339 metadata/md5-cache/x11-wm/mutter-3.34.6
-2005131339 metadata/md5-cache/x11-wm/Manifest.gz
 2005131339 metadata/md5-cache/x11-wm/openbox-3.6.1-r3
+2005151009 metadata/md5-cache/x11-wm/Manifest.gz
+2005151009 metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
+2005151009 metadata/md5-cache/x11-wm/sawfish-1.12.90
 2001140709 metadata/md5-cache/xfce-base/xfce4-settings-4.15.0
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2002112051 metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1
@@ -64731,4 +64757,4 @@
 2005081846 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
 2005102339 metadata/md5-cache/xfce-extra/Manifest.gz
 2005102339 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
-2005132239 metadata/md5-cache/Manifest.gz
+2005151809 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d3944fe97255..631a1d28ab75 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2020 20:00:01 +0000
+Fri, 15 May 2020 15:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e6dea272cea7..863f5e9460f5 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-72d621fcfc4711081ab56cfc6e97c6899dd996a1 1589398381 2020-05-13T19:33:01+00:00
+668b34f6d211ac9fb26b1c88213ede294c145ce4 1589554820 2020-05-15T15:00:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6374f7500994..6b4e786cad7d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1589398501 Wed 13 May 2020 07:35:01 PM UTC
+1589555101 Fri 15 May 2020 03:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c2cfabb46057..8dcb011319b0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2020 19:38:19 +0000
+Fri, 15 May 2020 15:08:22 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fafafd72be27..e3723ab5f703 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 65f081de7a93..442444f4c49b 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -1,6 +1,4 @@
 AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73de02b983098d7762852d5dea497e717e0c978d773c871d35ba8671a4d292896aa276703ea9d2450e053add1ff3f2d6d9f1c53bf1 SHA512 9e8d58dee6c60b48e209a69eaab10abcc5eccfc28edf073240afba3d3e70a36ead4a568fe6589dd8578d11f0149c968c5977742e9905fa0a407b120c6d168570
-AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca
-AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b
 DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b
diff --git a/net-analyzer/nrpe/files/nrpe.init b/net-analyzer/nrpe/files/nrpe.init
deleted file mode 100644
index bb7e34ef22e7..000000000000
--- a/net-analyzer/nrpe/files/nrpe.init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${CFGFILE:=/etc/nagios/nrpe.cfg}
-
-get_config() {
-    [ -f ${CFGFILE} ] || return 1
-
-    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
-	${CFGFILE}
-}
-
-extra_started_commands="reload"
-
-command=/usr/libexec/${SVCNAME}
-command_args="-c ${CFGFILE} --daemon"
-pidfile=$(get_config pid_file)
-
-depend() {
-    config ${CFGFILE}
-}
-
-reload() {
-    ebegin "Reloading ${SVCNAME}"
-    kill -1 `cat ${pidfile}`
-    eend $?
-}
-
-start()
-{
-    mkdir -p $(dirname $pidfile)
-    local _background=
-    ebegin "Starting ${name:-$RC_SVCNAME}"
-    eval start-stop-daemon --start \
-        --exec $command \
-        ${procname:+--name} $procname \
-        ${pidfile:+--pidfile} $pidfile \
-        $_background $start_stop_daemon_args \
-        -- $command_args
-    if eend $? "Failed to start $RC_SVCNAME"; then
-        service_set_value "command" "${command}"
-        [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}"
-        [ -n "${procname}" ] && service_set_value "procname" "${procname}"
-        return 0
-    fi  
-    return 1
-}
-
diff --git a/net-analyzer/nrpe/files/nrpe.service b/net-analyzer/nrpe/files/nrpe.service
deleted file mode 100644
index f6546d703cd4..000000000000
--- a/net-analyzer/nrpe/files/nrpe.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Daemon to answer plugin requests from Nagios on remote hosts
-After=network.target
-Requires=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/libexec/nrpe -c /etc/nagios/nrpe.cfg -d
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
index 961a37d26036..16f2024b0a27 100644
--- a/net-analyzer/thcrut/Manifest
+++ b/net-analyzer/thcrut/Manifest
@@ -2,7 +2,7 @@ AUX thcrut-1.2.5-configure.patch 2088 BLAKE2B 413e67d125ac4dcf086b06a63519d79d4d
 AUX thcrut-1.2.5-flags.patch 246 BLAKE2B ab0cc5cc76bc4635e68d0c7ca5f4d1f9595c308fee387d0579107be9a295c88e100f6a2157b9503dff5185ac1a2d270cc116230645491535436fbd94d3e337f2 SHA512 4ebfafb9f9d9610b1ed695ca471f5a5284d06069db7a9635bdf29a72032c052f8e60688853048ee7ef90c2c99c3e34a4dcce0b88d2f1e1716a1a4ec3411578d6
 AUX thcrut-1.2.5-fno-common.patch 480 BLAKE2B 745161f671fa666661064b5ad62808ed561be1e4d0ba3d533ee3f67d0d27c8bba821ff966d2fdb5d37e4ea1a4a059b437f99b09be5e5a792ec2937ab99bb67a0 SHA512 c238316e56a225633a5665199c392916dfb6fedbe53f3d1bb763d39c318db753a16b6b91250ff0a93041f4f0e7b55669095431f852c97b7a90cfb65bb4dafe17
 AUX thcrut-1.2.5-libnet.patch 1344 BLAKE2B 1b996af83b2db43dbf1528e3de7fcfc20397b4a1d5f4a033e506e5567c40d639fb0734f86d5cf26cca59ca833d85174b58bd8ff893635c76345e217f0b92773f SHA512 412f925820c3aab4333ee56d7a0d697ebd278225cd90cf0e7abe5edae363faa95c3ff450b5311ddb05e12b2839b99a850a4a7f1a0cc7ce51c6c53c1c56874b07
-DIST thcrut-1.2.5.tar.gz 660673 BLAKE2B b57d2f15a4190880b135c2631a377f7136f56764d16a5fcd367b72d2cb33313a5c3651bd9f8558eb7b12a630de45674ab8d7c279dd3c0b57a2a8a2407dce33be SHA512 954f7512bd3e3937796cc065612214ae7d17f70175305ee66951a4e4dc2fcd83c7b15c690f429c7642c9951c2219f86a045418a77e42e3e4a54deac2ae0c46ab
-EBUILD thcrut-1.2.5-r1.ebuild 634 BLAKE2B 8c7de5db26feaf3e6f53cbfd01a90d6daabd79e776d247f697408f317859ba9e79eb16429d04c94f3fcf883928379c16f508687f79e51af733cd6243540d2ac8 SHA512 c92ed1665bcc1a909f8b9366ec8a411160c7a2c43423b47d57e2ee9f88862df18c5d2315b447ebcd44c8c98825127ed708954d8bd4cbb44eeda96156450a346d
-EBUILD thcrut-1.2.5-r2.ebuild 725 BLAKE2B 54412f5d079e49dc9626110a3656dba6b4a248e91cfe751a14a2c76b2b971014815d8ea0023172439d6df25e264ca7ebc9b518bafde3db546644be31782ffafd SHA512 0291295d555bb457157088f48f1ebc04607720b585e6b54051737e97c1f40baba6a99b653be4a6cc620833d7f474147ba6badcdc79db9a9b481942b052d7f5a4
+DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39
+EBUILD thcrut-1.2.5-r1.ebuild 666 BLAKE2B ce4568f14e77e08b29a4737c812fbf11633394f387881f2f09f3ce4566e6d82ba4d8edb4c251021998fc9d702ddf3f673e0950485f87d5c3d575c611c1bcc050 SHA512 e8a585dfee6c4e02420dba3d4a5efd05cf878c0a4e92d1b1530d432da1a90b70acc2eb2af786726e8c138695399e008485cb54d2c4038744c3c31b23e61bf56d
+EBUILD thcrut-1.2.5-r2.ebuild 760 BLAKE2B 8a0fc6699ec8161f1f039f7e4db23db1d31b6a88d7a7e8ba14ff6e3676b7e070ebd861b3bc1c714bc77727f73a271bfebfbe2ef8c34d77a82141786dd02f97e8 SHA512 0871c6b68f68c742e90c522738cbe66356d3968b8e0dbb0ea8fd7593dc4c3c32de0e944fb04bf05d16dbbd3a9a04b176bcdd9cad491c91e6424131468fc4c52c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
index 81a092c175cd..fef8c3f8e44e 100644
--- a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="Network discovery and fingerprinting tool"
 HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz"
 
 LICENSE="free-noncomm PCRE GPL-1+"
 SLOT="0"
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
index 191ed447f475..3e5ea0999a81 100644
--- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
+++ b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Network discovery and fingerprinting tool"
 HOMEPAGE="http://www.thc.org/thc-rut/"
-SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
+SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz"
 
 LICENSE="free-noncomm PCRE GPL-1+"
 SLOT="0"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 8ca2591b79a9..b024f4d7333a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -14,18 +14,14 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb
 DIST zabbix-4.0.19.tar.gz 17211769 BLAKE2B 1f7ac3fb195c35a41fae84a2b9a7985bee49664df8469ef7a14b9e264348447e5d5822fdc05feca4041ca57e74d15bc8b5cae262024fc5dca7749af263224d2d SHA512 c279af3d8b1b9125420d65e4e20a8892f9531a345e1f0046214fa14ab6204d535fd0cb672b5f3c6b5e325b7d8ff44e317bde58611f4bef9d89aba70851326daf
 DIST zabbix-4.0.20.tar.gz 17215217 BLAKE2B 144b334e78b121d0ba01b285590a6d354ed54be8dcebc12216b51f9829dba98c76d122bb329efbf67931237636fe178ecf5dfd141954fe37d1063c24c3c6dcda SHA512 5f761ba8bd3eac67de9f8d3614ebf437a6a4cdad8f0bf961c8b4cbe39f13bafe64bdb58b6ba56f1a27304ebdaa32109447bd3328fd3e2fcc1aacde056fb1d5dd
-DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c
 DIST zabbix-4.4.7.tar.gz 19413652 BLAKE2B 3c7d55a64f8d0e94d7fca3d088bb40592f56ffd5ca8025fb2cdd82ae7946bca1449b354e74cc3e50a6fca9b0bc2b46cf995b74d31d4b462f3d0b4be734f7c19b SHA512 2b96771bb555fae3df67665ac2e47c94662b071eb97c943d59b8f1fc7d31e2bf349c551a0015c6e239321f069b3ab87373c397a023cbff3daad8bd310d11fb6a
 DIST zabbix-4.4.8.tar.gz 19457802 BLAKE2B 4cc566b744d500c5f3a95eeaebe5418ff58cf3852318f474991706b0f81d1a9b0a1b3793e3e28b99fc45f4a6bfb9281c4d42acb5bb8fc49c37802d3c245dd853 SHA512 bd850d4ec8f30b9bcd531d84606c900692be5b91424cb06f66cde24ed4634a93d25476010e4387b51933406c2552a611e2e7ec4691b57ca6c38fc874c4b1aef1
 EBUILD zabbix-3.0.30.ebuild 9227 BLAKE2B 565fe222ec1d1e2aca06bf705e78fe3c0f641dfdacd61f6346efd85385386e04e5c62eb079e16ebfb9307b84a8eeb2bbb220a59e0d771035a59c669e9685050b SHA512 055dd251714720d7d175d6f4c7c07dd0d452c339b007dc75501ac17a4185ca32d7b3d57a30e93828373c67a3bbd7a22f468330368c75565a26faf6610aca9dd7
 EBUILD zabbix-3.0.31.ebuild 9214 BLAKE2B a03ee28ceae862d1909846f682b9489b7a23b44dce06267ce258e9137c8755271e4a90357fdf1d7843c8716df1e9518ed7188a95be4b651fb505b27e947453a9 SHA512 e4dd3829d87dbe8c28dc82e00574e6712abaf7c8b11e8bf97ccf059ff820e3689e64bc89387868c7c453328619eb62a33819d8831e50784c1ba5a6e19cd90f24
-EBUILD zabbix-4.0.18.ebuild 9242 BLAKE2B 8821d1ad7452f863b8e14d54f60b460ede2fcdcf519431dabba2d64ec49b137686ef071c3c22a1d211bda2ed45b8c5f326eb37b598720a67e8d2c43e6960ce55 SHA512 22a2768ddcb2c05aaa4192bedf94bd92e68fb6504f77ac0fb87ea3ef39d34136889cd7f27f436f36f485ef8e8d03bf945c36965a76eaef2b385294e07383ff1c
 EBUILD zabbix-4.0.19.ebuild 9250 BLAKE2B 77bad68ad6c6d435d07aa45c2f381772a8a694c5f0408100f34826cded4059ff310036c3e2d1b6f13b792e7492301d7453e8de126acedc8e7f4cacd2dec6e013 SHA512 62a6d0c2edf95779d46bb84a499fae78205101f4d4e3599c14aab3163b09ad9493742d15715b58b60088a5292694d8fed07dc286016284f2817ef026d23c1366
 EBUILD zabbix-4.0.20.ebuild 9221 BLAKE2B 342880176c78e465fe5d650826393970a5600a6a38d7ad9a40af6f8f48237a90939466079af51d63be7a939a1bea69b3607714bbfecca187058f1747121fe43e SHA512 27a8f7b4e46d9f5779d6ced6cebc13c1aef37ebd699ec9e52f31feb836eba4e4759e3597cf1995873f7808a952083f774931a4ab3e1cd7e84bbd24a6a859f1f5
-EBUILD zabbix-4.4.6.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0
 EBUILD zabbix-4.4.7.ebuild 9119 BLAKE2B 558919cb6c7da44f730c97a185419f78916ce42be00278061430b0f4faa6c42489baffb2d6cb4a4bf425a461a03a82b14c0f0aed707b077b417d1b261f28b0c3 SHA512 3cf95baa0d1e665b8d801cb664c59546a71e8d7a1134dc110c6850f916ae812e2eaf2d20e45fc8eca6ad77acea52704277b68f25ad36b8eea9b1c8e371f995c0
 EBUILD zabbix-4.4.8.ebuild 9090 BLAKE2B 10ceda1d5e6f59db90d495d97931e315325eafcdb1417e87f3894ef641b496f0873d19b09dfbc955b1e2daa3006264301db42c481d853f0040d8262d28eb029d SHA512 800867a11a498825eb8613e02268384f98836e48973ffecc2071946c448569f0d4b8d07ca965e277a8808f55e87062339718c770354ec44b3a4bed2ea1f3cb07
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.18.ebuild b/net-analyzer/zabbix/zabbix-4.0.18.ebuild
deleted file mode 100644
index 1825d361d641..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.18.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.4.6.ebuild b/net-analyzer/zabbix/zabbix-4.4.6.ebuild
deleted file mode 100644
index 4f4099f27c63..000000000000
--- a/net-analyzer/zabbix/zabbix-4.4.6.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index fc3f6fccfef8..f6b3dca039b5 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9b521cbd0ca8..148c462b3f42 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -9,5 +9,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 DIST dnsmasq-2.81.tar.xz 510648 BLAKE2B 07861888df11f6e2e02d1b80f4e82a407b558ddb34e016f7bda5cb449ee870db000683264b2e36987ece16d50ab773f239bf12dd3468b9529ae4dccd77ecb8ee SHA512 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e
 EBUILD dnsmasq-2.80-r2.ebuild 4831 BLAKE2B 6f9d26f373d551c7e623126daac06236dfd28a6bb1e8b240ce7cc67e925d1613463e2c8e95549aaad04566712ab697a57f039593dd94feb3e96768074831d90f SHA512 ded0f38b712acb054ebb2ddf13defbb79a162857d0432f781dad8d2aa63a115a6367fa679f2d39563a8f189b549060d119fec98f9832300e61339f03031b6efb
-EBUILD dnsmasq-2.81.ebuild 4664 BLAKE2B 729205e125d1a82d25a8d7b44fe32f9f5da9a3499ca66722f2083dac695e6a952f7fa2398185146cb6a919f6562538aafbeff1cd9a0976f550aae50013e9189b SHA512 f71e5fdf95a96825fe38665eab42225d8c83dc167280f7198c02af34ebe3b06484bc0f1149773a8865f3774ae3483358238642feb4c835f4d9f69bd155a21e74
+EBUILD dnsmasq-2.81.ebuild 4663 BLAKE2B 869e862f77fe47fb4a77bea55b409587d0d1ec9acab83541ef483452de088aeba39940d624ebcc17c4b657385a54878c0604352c2949fc855beaaa921e198902 SHA512 ee64334926b4d97de11dfb317604022cb5acb25f611cce9ffa705af34c3fcfba3ac63a5484195173830a929e324a6a66d63ece8a936c8453dab972bd2f96ce63
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.81.ebuild b/net-dns/dnsmasq/dnsmasq-2.81.ebuild
index 33ff7a57cb6b..4566d33354fd 100644
--- a/net-dns/dnsmasq/dnsmasq-2.81.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.81.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 5a51eb4f6226..954a199fd400 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 09ca21750faf..563bd1d2a2d1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -11,7 +11,7 @@ DIST samba-4.11.9.tar.gz 18576961 BLAKE2B 584e62df96bd7de6c0ff93f8fb45b85583b048
 DIST samba-4.12.1.tar.gz 18159628 BLAKE2B aff697383ed53f4e8d7506ca284d160e76747ea49849c32bfe712fff83cd1a66a835c8da4f325a78599e53dc29f59e626fc7b285c67c5364f180491c3ba62f7d SHA512 2645f72dcc4718bd2e85af73a54b3e6d0ca9e11bd6991a47a6c17a8b89b69f294a0875ef9762dde28a25d1ff030e0e2d0e073a6993e2df0d6b17e75b72d1cd26
 DIST samba-4.12.2.tar.gz 18192360 BLAKE2B 1ef1b128dc628d5b8b69183fa99eceac27feaea54207eb2e5e2af5882cdf17d2819efbfc9f91cf73a9c744b5ef17c6b8dcd135783da9a36d8c41246d2c4515d0 SHA512 c1d5f62ea2e43c246988aa65c4b690de232f73c0213cbc5d532e43c8cfbea17f1ac92435526b64c9a85c582b29381eecfb57713861efc32f6e6257000c393562
 EBUILD samba-4.11.6-r2.ebuild 9331 BLAKE2B fabf6baea685d888cad0cf974005986043b2d21ee2915db9b97fb6d24a43e148e28aa77e22a0456952141a55d97ff496631a59b481fb4b25af1134f418865bf0 SHA512 c35ed162c8e1d9a3824d9e46524ecc7728bdd11c503fab0fe849d271c37aa2d3c93dc2a6a08054f69cdfbedb218ab1bd46e6da9d4b4a169e8e0bc240860116a3
-EBUILD samba-4.11.8.ebuild 9280 BLAKE2B 75808c81f8828b1c3b1319cabc5f9484e49d420f35e9f2b833374a4b627856a68821a52965181530ee2ac0e34b23a5cfa2f6090a29dd075773ace64f0247c877 SHA512 b049c1cde581320b7cd0d1762a25f1eb3ea0072355723c932ca01c20b2618afdd3a6f6be57783f6b8dc738262c8d6de1653015ee1db956c66495f201efeffa0e
+EBUILD samba-4.11.8.ebuild 9279 BLAKE2B 14d8a3cf0eb9897ba11190d6bc5b3da37f73be088adc6b5c843e51492c30c89548f6cbd6b465b111e61707a18125482c3f5aaf61edd583ce352d10446f774e71 SHA512 7749b7b9ce531f1e7a53d2b0100adc4ddc4b19f6e8068b6f7058fda9481571e7b8d09bba2589fb4e05998a4fa50aa9ac22a80daaa559e70c013115e59dcac42e
 EBUILD samba-4.11.9.ebuild 9348 BLAKE2B 5d44aa90662162b89302c956f49dc82891b14a644745353598acd259ad398158e2c6fee28753d66cdc66478ff85ae11f6e81d22a08c2e6eeaccff39858ccb273 SHA512 95adf5b8027141da44ed5ce9dd2cde19e67db148b07b4d4931d5fdf1e920cf7d6f758cdf49200b9056ab13967b3c078b06276102ca1065938b3a2c5633a46570
 EBUILD samba-4.12.1.ebuild 9262 BLAKE2B 00a893f69e2a672fe91122424489c6646e60e99915470c7956e9055fbcf3c7e9bc5fb30c50b3e769b2081795c16261cdc0a201e81205356b8c053b236fbc8d90 SHA512 ed876b07154e51b30499ba0f4c5651a08fff01a05228998b09f99d34adee30af5a6dfeac0763fe23291a87e9ea1602992ec9d02350259995f8ab91e8365d21e7
 EBUILD samba-4.12.2.ebuild 9327 BLAKE2B 84d1b1e50ca32638f865b80ff221853dee1b27cf724097ed8f3ccde0bd442e64c2b86ab67d8cbc803e9fb69f8fe9c0b4a4cfb8998e15cb6366c26bcdf68952ce SHA512 a328bab527b98d28ee48fd6ebb53726825decb43955ee01f9cd39f35aa899873372200d2cdb31286659204ef7c982564d4830342721ac399e225c86831d8ea63
diff --git a/net-fs/samba/samba-4.11.8.ebuild b/net-fs/samba/samba-4.11.8.ebuild
index ba2b9e59bb6e..62524d3f12f7 100644
--- a/net-fs/samba/samba-4.11.8.ebuild
+++ b/net-fs/samba/samba-4.11.8.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 09906088d9b1..5c7f050b9440 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index d95f99e4c29f..bbeb734b38d8 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.33.4_amd64.deb 98801978 BLAKE2B d08ba8b74b9cffa7e81c50d225e936a2faf6d0fac9bb12d7841afd794dc136804ad37242a51eb7ec1311e41b35f7cd4c945f8e6169f0f0f2fff9a297e96897e8 SHA512 65789bac0d9748c4c9874b333bc0a05fcd30995f2ae61fb7cee0e3c52ad97ba110f5249559a7285e1bb9d214cc01f2529b89d306f73cfc0befe1d473da3e7210
-EBUILD signal-desktop-bin-1.33.4.ebuild 2400 BLAKE2B 0ef74103fa97c0d7e2d4aa561a0b6e6a50485dfd969de43a2d4667fc283e43fa94becc6363a3cacb76c845edf642e1336637044b818f4349fe9476b76dd89cdf SHA512 68cef676e5d6e1ec1fcddaa787420ce728f660e6eacaadaad3c3a09d4d23e25cbd264bbce2f3aceeab50a4fa9009172ba5dacb4e52dceabcfa81163e95161a60
+DIST signal-desktop_1.34.0_amd64.deb 99598948 BLAKE2B ce0a0bd37c0e6697397101e9fa37864e06dd0ed24af569b6e1084460e467d19b82d77e87c21943747ba4a24c269417183dd5d4bfac45b4c1d3f89d4c155c747f SHA512 56bf02ed593ab532bbbe9720d0466158ab5c33fc4c48b0e606f232159ca6d86386dc0fcc49ba39fee23c85239098d87eb7ff2849785bd56b936b7d1ae548168f
+EBUILD signal-desktop-bin-1.34.0.ebuild 2475 BLAKE2B f706e0174b1e285cefaa50b9304ec05fdabb132ccf0eb09183b8ba70b50c38cf271b322820fc2011a2094426305816ccff5e4385fdbd78760985a6fe7b1f693f SHA512 276ff0398fb65a6aea6d4230e22652c7bb38405adab308f5fc120a16531ba5764711664af1141935c115e4cd19188ffdba8582fa45fc93272a056c8fba102c13
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
similarity index 96%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
index 4f84db2ab7d9..b339b110aafd 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
@@ -36,7 +36,8 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/libvk_swiftshader.so
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*"
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
 
 RESTRICT="splitdebug"
 
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 3f9ad045de4e..169edb810065 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,6 +1,8 @@
+AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
+AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2632 BLAKE2B ba13a6558905ef07680dee10fc76761cddae36e286730a86ddf430aef0953afe3fd80fe971a5714bf4b5db158a83a91f3973c793a5bcec5fe774a41fc204190e SHA512 2cd0a1bc261e7e821e4d7118cd6fe3c556837a7289ff619a686e5bb041f25a6f2493bc3aba41451a6ed2baa614706e06befab02c1db0d269cb183e31801ae25a
+EBUILD spectrum2-2.0.12-r2.ebuild 2742 BLAKE2B 6a75b45f4ebf98deb7f8061fe99d0c8b15f09d34c5991eaaf2119e6bfe312c702f698a15b7dcd09dbdd931c0d67ce5437f02a2000cdc8bac357fdb1da1902413 SHA512 3301190f242f2aa412a0ff1b22ff3e640e472cc701c8e541ab953d82ade39e6f571aa1dcd61cff5736666a09f956b13f0f301ed8b302ecc5d088249eb3a64efb
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
new file mode 100644
index 000000000000..b9a8adeee5a8
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
@@ -0,0 +1,21 @@
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Thu, 14 May 2020 10:34:43 +0200
+Subject: [PATCH] Fix compilation with boost-1.73
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ include/transport/ThreadPool.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
+index 5902f965..ffd07c8e 100644
+--- a/include/transport/ThreadPool.h
++++ b/include/transport/ThreadPool.h
+@@ -1,5 +1,6 @@
+ #pragma once 
+ 
++#include <boost/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
new file mode 100644
index 000000000000..ad13208b3e13
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
@@ -0,0 +1,54 @@
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Wed, 13 May 2020 14:22:27 +0200
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
+
+Since GCC enables by default -fno-common,
+the compilation of dfrotz due multiple definitions will fail.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ backends/frotz/dfrotz/dumb/dumb_init.c   | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_input.c  | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
+index 4b9c6704..35295b74 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c
++++ b/backends/frotz/dfrotz/dumb/dumb_init.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ #define INFORMATION "\
+ An interpreter for all Infocom and other Z-Machine games.\n\
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
+index 4149b2b0..88fc8ae5 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c
++++ b/backends/frotz/dfrotz/dumb/dumb_input.c
+@@ -5,7 +5,7 @@
+  */
+ 
+ #include "dumb_frotz.h"
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static char runtime_usage[] =
+   "DUMB-FROTZ runtime help:\n"
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
+index 9e505167..6dc7db82 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c
++++ b/backends/frotz/dfrotz/dumb/dumb_output.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static bool show_line_numbers = FALSE;
+ static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 0bc829465f94..e2a557eb7113 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -64,6 +64,11 @@ DEPEND="
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
+PATCHES="
+	"${FILESDIR}/${P}-boost-173-compatibility.patch"
+	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
 python_check_deps() {
 	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
 }
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index fb883109dc88..5667e485ec22 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -5,10 +5,12 @@ DIST tdesktop-2.1.1-full.tar.gz 26178569 BLAKE2B 377820af9d2ceeab18fa1ca04588037
 DIST tdesktop-2.1.2-full.tar.gz 35603888 BLAKE2B 40ca92e5d7bcc291ce8b8ad4404dd27399dc5dd710e869759800c694c36721db892f1da9273c718672e2cea7d918059035f0af3e8cfd9a7b42f3f24b7d34b5a7 SHA512 c23d9a961132cd2592ce8f728ed7592091a8c2a1d94797facd93516ab0c9194bd5b90ba7a7d4e8aa778940bc4a23d4ac69507a9f150c3bf4e743c6659e545ccf
 DIST tdesktop-2.1.3-full.tar.gz 36121092 BLAKE2B 667f73ef9ea41e06b9cd536eacc1d84229376f78662f8e82916bbefde035145454c0c9a62b7fbe613dd1e502ae522ab88d23db8bfbc6e3cb7abe1e319cbd92b0 SHA512 ec5743a15fcc051cfea9379ecd5811a9300b46b29108a813a67575e2b2a99839c83943c5513f17a1119869f722519628884aa9af63cbf4b65640944c16ff27e9
 DIST tdesktop-2.1.4-full.tar.gz 36377172 BLAKE2B 115f98879539ad66d57cba1b725f65558804536318d72532a6c93e17626341199f3fc9ea446f11b6a31b5e526cb102faec1db94e54800dc96dfbb038bc42670a SHA512 5b27633cdcb4edb61af983c1e4867bac3d7d0864e100855ea3f00c1eb1037e6a9f43414c09211282b5b677603ddfaedbcf4cbf482502ca4e33152e417068c959
+DIST tdesktop-2.1.6-full.tar.gz 36478989 BLAKE2B 4c5364e560500efd445232c05556d1bdce63881b179906cef2602161944ac45d63af19c6f97b57dec9224c12a5b083c83fee4cbb56986c3edbbe3d76710f16c7 SHA512 a6a105676d8d24ec3414895cadc664829c5abc041d8614409e22d7964d7280e44df35ece5fca18a0cd127f65bd363abc1e5c36807b0031eabd6eb77c7effdfb8
 EBUILD telegram-desktop-2.0.1-r1.ebuild 3634 BLAKE2B 63b7ac611fa44df6daf9d03229455c9fb478c6de5f6218304b3a697ae67d54d358079b01dddcb108cd56e72d279f3b1b390e910e046a0a8ef30e0c5d7f387db8 SHA512 600f025c5ef8580f05049789a26b289c69065b6a934bed14594121e79eba92b043150959eac2c0f61fb380c7ba5663e55ce006a866960d54a67506dd60bf1a3a
-EBUILD telegram-desktop-2.1.0.ebuild 3682 BLAKE2B 95425eff2648434f75cf3ee02a8fa5a44c748599ab73d3def605eb19f2324eed8e18b40e448996194d5134971090b8e0f0aa1da928bb05dda1b2ebd52ab5953e SHA512 3951aaac37407b23850dc3e7d69e53c1652fbb3eb61e0bdfc9780544ead08cbaf6dc5c4108530d32058d524d5ddee4bf3bcfee391deec7dcc0449fd5191aec4a
+EBUILD telegram-desktop-2.1.0.ebuild 3681 BLAKE2B 8b389087fa68ec94a8f57e883e62e397ddab0deb547e1b8cbfcc8a661461ba803bf8f2363adc5757dcf0af27a203bb3176f6166142529d1766e5881b6b9e8de9 SHA512 0cef59399d4b88fe9273ad15617dc69efda015ee41c67b46c1a768c038d21971137a7229f11bdb26573b7dd885c9256631f7d54617f60aa82f75d7ca51fb67b6
 EBUILD telegram-desktop-2.1.1.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
 EBUILD telegram-desktop-2.1.2.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
 EBUILD telegram-desktop-2.1.3.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
 EBUILD telegram-desktop-2.1.4.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
+EBUILD telegram-desktop-2.1.6.ebuild 3963 BLAKE2B fac016b41b7de244c6c9835e14d59e4e96dd90f0bfa4bf6fdb99a42b0e08754386b69511b3a0b3e84ace10d325720005d90d793876bcdfb37a32d19532262357 SHA512 7de0ee03d16798a54ae48648c2bdeda7b7e437cef97642191bcafce527ced845dfa0d5787b0554a90b92e36be3fb988aab5febc20a59badca1552f2f2856b3df
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
index 6c7b00706da8..07c9b19ab458 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
 
 RDEPEND="
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.6.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.6.ebuild
new file mode 100644
index 000000000000..3206772347bb
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.6.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200430[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4680c4af1ed4..f45b9cc92adb 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index e734e4c505c1..3ccc47699440 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -5,5 +5,5 @@ DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libhubbub-0.3.3.ebuild 813 BLAKE2B 50d1b0f9d5a81647359ad8c0c43cfd1752fe70ebd4663f6d33122b23061ed72a6cb563eaedb42a01b0ff2a925da2f305b29892917ea78c09a4465712ff99cb76 SHA512 e73c622d5df44f6447bf9bb499a0bb513c9156b40f67ba04fa2a08f0aa1c36c333cec9d2454de35d3d0d3620bfb5aa27c51e9974e1f7f00b440a1674aed42f64
 EBUILD libhubbub-0.3.5-r1.ebuild 1140 BLAKE2B 4c92376ec7450896597e8b582ede11da5ca8ab72590741404b3c79f5fbcbc55b72a8371c0a4e18400185cf79c0799a9fb1cc9dd986366f01b5085de15c20e010 SHA512 fdada0957a19b27dd8b76c807f7308db5976f09f81e026d5bc1df83749abf969121c6c1dfa690b9fe5ffc524e47e13d97b05aecb933710855221474056cafb63
-EBUILD libhubbub-0.3.6.ebuild 1178 BLAKE2B f5b6dd51b8e32692c7cb7ed55f27af15e2cb794336aaf1c4cfbd16379e32f066cfab76b60e7f3df89a2d8a2bfa6755e7eb029105152c27b86f1016f1ebe11a1d SHA512 7bbedde1b878973d42d987d0548b603c68485a9125b1f7b800c1379218255c449f5a380a732977c1b6cd6f4539fe863224663eb293eb8ca1d359225ae91937db
+EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
index da280be32d28..8de3705c4ae0 100644
--- a/net-libs/libhubbub/libhubbub-0.3.6.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~m68k-mint"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 34bb9458d8b1..6e1dccbca758 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -3,5 +3,5 @@ AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b
 DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
 DIST libwebsockets-4.0.7.tar.gz 12337469 BLAKE2B 0ca58050e60afb4fcb349a8035afa629fb2d4645d7413cbaf7f1cf6cae8c5606de2aa72f1dc78778ba00c0fe723dd4aab55cd03c0a96122a1e4ff7d3cdf66644 SHA512 14b2f762db220fd6003d04c05566786b292913bfc71667327b17e8a357f4a7b5b0a09f246fc9ed527f7db106586c567345200120d32428183d39e16ae5a6287e
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
-EBUILD libwebsockets-4.0.7.ebuild 2302 BLAKE2B 3964454e23943da6afa9c080a4edaa2eef08afb8ad21308d3aac1d4dc529141fc0e76dfbf834a214972d214fdffd2a7790083de500db6d51178638e701c0f40c SHA512 4e99f646d3cf8687f254bb51203faf1047e7e88b77c73b79a95723da47594b900d6570e7ef4510887b81ed6eef5a026bafd0842256ba0f0c3d8bd38d0615dbd4
+EBUILD libwebsockets-4.0.7.ebuild 2309 BLAKE2B 3f0e70cccc43a31cb5e92c49b38307dca75b88b0993ddd237e75777b0666b57931df9e642a6b14538bfb806a392c96bb38717cf89b3627ed39c388e3f1a64739 SHA512 7d7d77884f1c1fa5514e5b98f21902fe3013663d15fcd470520bdbfdfa96c98fa6352c0ea914d3079687f8160bfd2d3c8990c473b5ff55efb9beadfb64d6ca39
 MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
index 081c762f0a8f..313e5908bc07 100644
--- a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/16" # libwebsockets.so.16
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 96642e375046..1eb9acc51d3f 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,8 +2,8 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 DIST srt-1.4.0.tar.gz 1293647 BLAKE2B 93edaa8b1d2b59776bc3efc851a5216e0acef3766b47100646306bb04e3054d4cdf612da07bc5d1124380abe595733393d7e47f1885282a75e24f34b688ddb1e SHA512 b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
-EBUILD srt-1.3.2-r1.ebuild 1161 BLAKE2B 315d7a893f0d09fbbe35d2fba5be996b6683632a29dbaa298cd9a135dddd1875606324bac9358d1e1e58296461b88d0fadb81f8250f9e8071cc56f563746609f SHA512 5dd656492e3526b4dc0ec25e7b6285b5acee7a822c921d20126549cc5bdc7033c1564b52de5e7df8d71399b0747be1edda5b6cec0261af8bf1e4706cb9d13240
-EBUILD srt-1.4.0-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
-EBUILD srt-1.4.1-r1.ebuild 1173 BLAKE2B 963c7591dd13a141cddd8dca02770248e696b0c73c99d5248c887a96d1b02a55032f3cf4f0237bcf6bf66be5ba0b9f1c45194ada04d1af4263b96c25ec54412c SHA512 c55cdc6dd42ce965194243f4c99c3d7e55a3ffc8825befe8c3296edcaf4ff3049a9fa71fd9851ed3c5e912be206c522368ad52ff73f448b037fb68b639c50f9c
-EBUILD srt-9999.ebuild 1260 BLAKE2B e4709688a87c70842f35920686c734ca636f22ed6c3f29075328678dd0845a3f299fd5bf3a619a21ff1654c418a4c6b3a39de035c1025f11c981758ec8d8abc5 SHA512 0707bda54bd42edead963231bf48017ab0c524578f7ce4c70709c36a2b0564ab8dfb258e81e85472e6715691fab6d5bea8ba17f8e4db05c07c964ae110a1a366
+EBUILD srt-1.3.2-r1.ebuild 1134 BLAKE2B 2d404965078d1e53c5ca23d9b6d864ea3937948fdfd60fa9f997b137235924ee413666fbcaf3c3d7f6c26060ac3fbdb743737f27d8423af3f8a96d754b609619 SHA512 4f9acfd1628531a3f3445498e0c01e1fd7625bdcfe054c41d81e4ce4719e1c6fd2f014a6c21a562a71a14b28db10bfb09094449d1bcfc8192ff61c887bcafaf2
+EBUILD srt-1.4.0-r1.ebuild 1146 BLAKE2B 8a932e5bfcea685d4cc80c8c845ed734552be15cdc433fc2abff80624fa384186965c7f77cb877529cf6c2be325ff23c35164ccfbec7743e59162981f2d7bc70 SHA512 a9db72f8162529b48fc64fbf67f86fdfeb153c74b2e3dd97699ba0ab0aaee65da8a99bfc5d7ce20b50b101c934a20648572f6ee2d9110f743622b66063b7011a
+EBUILD srt-1.4.1-r1.ebuild 1140 BLAKE2B 643b796689df72bfcf0204f9d2d2d6188af0e41930694195077732029b509cd38be328e1ff06c275cf97f565173a1f3c131d53aeba0d1d0c3e1ce2e734914cb7 SHA512 fa989a6e99cd15746d51b9043038f0cf1c7b0623d0e51aeb3a6e1b94302267902c9b8b72991d30dd1299f33ed26aff68dc7787ca99b20d30e9845aa7dd7cd137
+EBUILD srt-9999.ebuild 1233 BLAKE2B 16dd649f1be2cd66e8890a31a745607a8dda568c8f3fce6901fb67011dc3760a60dd1843e14b99364b89112233e7ba670e2b981462113cbc70b2715566fed813 SHA512 f8a0cd2696a8b99e7ca375c151e98d69a35c93847cbd7f08b7a7e6ee581419820962b6d5af4fea1efe636c037bade749fb4ad079990dfaeebde820eceb12cad6
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.3.2-r1.ebuild b/net-libs/srt/srt-1.3.2-r1.ebuild
index 864f007208ac..44488e22d283 100644
--- a/net-libs/srt/srt-1.3.2-r1.ebuild
+++ b/net-libs/srt/srt-1.3.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
 HOMEPAGE="https://github.com/Haivision/srt"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/net-libs/srt/srt-1.4.0-r1.ebuild b/net-libs/srt/srt-1.4.0-r1.ebuild
index 7a9dff6b43c1..6ae97e60aff7 100644
--- a/net-libs/srt/srt-1.4.0-r1.ebuild
+++ b/net-libs/srt/srt-1.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
 HOMEPAGE="https://github.com/Haivision/srt"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/net-libs/srt/srt-1.4.1-r1.ebuild b/net-libs/srt/srt-1.4.1-r1.ebuild
index 7a9dff6b43c1..e426154810a7 100644
--- a/net-libs/srt/srt-1.4.1-r1.ebuild
+++ b/net-libs/srt/srt-1.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
 HOMEPAGE="https://github.com/Haivision/srt"
 
 if [[ ${PV} == *9999 ]] ; then
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 283aff3244f8..ff120fc842f0 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+DESCRIPTION="Secure Reliable Transport (SRT) library and tools"
 HOMEPAGE="https://github.com/Haivision/srt"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index a8d09b43ed41..9ba45ff60d3f 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -3,9 +3,11 @@ DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932
 DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
 DIST wandio-4.2.0.tar.gz 410273 BLAKE2B f133e783f6f47a6d55058684b4965d02816a0fe835bcce274292287492e53007ebfce3b447d6ac9f58d8d4626ba20b7b6a7e5e6ac3cc054ef49d70c843c0216f SHA512 befbca1479b32cca909c6125e54be0a061d1fecfc01d9bca7cbd54f86564d39a02714805c7583d9b50896bb553a197e0f86fd10d4424782f5e9798a0cb440923
 DIST wandio-4.2.1.tar.gz 15417543 BLAKE2B 704ed3846cda3755ad305bdb84febed75ba1f044d0380465041cab9f44dc16c1a7fc8bb5a8d4292d5f6c12d6783af45d93bdce70228afc5438bbe7d6f5714491 SHA512 eab9180e477f63e37b11d090b772037fc319554495e6f3656da66e34dcde25f47566e87b71255645d9bb5aaaff721f0dceace4d880cdca491c05a9de6852553b
+DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
 EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
 EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
 EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
 EBUILD wandio-4.2.1.ebuild 939 BLAKE2B 5b655173042829fb5466eef3fb5517758e84674243b6f0c0bc3a4df8d183b251df5a8ec10f61f8f3050d6bd81dabab36f8733fda4ad3e8452c7e5fbfe48c8cb5 SHA512 428e577429bb6a3fdbcd569d003ad27828b384163097e2d1cd0a7f0e3e3dd5826529915b78c322be4d7e14b6b5aa2e8ed5b8bae709100c3478e2d46cb9b78870
+EBUILD wandio-4.2.3_p1.ebuild 967 BLAKE2B 369eba1ba10c29b55f3fb175399624ac925937859391621f5415b4119e3eee615ff225be7089a3ffb33a8653136c864119cb233e3a7e1bcac970e27c64eb2a26 SHA512 4c467ea9ad7bca3adfb09758f8dd3fb32c847b960d15a663f3441180c7e3343d8ef8ad1ccc6f65f54059582e4ded6a546631cc9ecbeea118ae539d9b7d8a4549
 MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
diff --git a/net-libs/wandio/wandio-4.2.3_p1.ebuild b/net-libs/wandio/wandio-4.2.3_p1.ebuild
new file mode 100644
index 000000000000..5da40030c1d1
--- /dev/null
+++ b/net-libs/wandio/wandio-4.2.3_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="C library for simple and efficient file IO"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( app-arch/lzop )
+"
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with zlib)
+}
+
+src_test() {
+	pushd test || die
+	sh do-basic-tests.sh
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 422209267314..0e623388230e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,10 +9,8 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8
 EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
 EBUILD webkit-gtk-2.26.4-r1.ebuild 8749 BLAKE2B f470ee46cd08ca1a210ac35c0dbbc7c8df2b62ba2cdd775a903c3d7289df8b556259c3b4456d4612efcd3e5ec6fa8d31b03221fbe1d9af4faf9bd7b283797435 SHA512 1e589c989cd9badd30b113550cd7d984b8e4a7da122c15c4df9c0e57de2076ea14ab3f4887981aaa43003c3a9960374f396b0ff5e920266ce724dc01179f1ae5
-EBUILD webkit-gtk-2.28.1.ebuild 8734 BLAKE2B e45a6631cb74a277f24c997b3076553735724ad3e3175a4a5c0d05049f7fc23faaa098866d5ff131ca5cd6444acad3f8fc8ef2166c54ad6058f5751692ea808c SHA512 f649ad4de4fa66baf48de88fd422b477050e90a69ebde01ede9e43a8d073fcd85151a1efc0b61e3e492a24cfc68c328bea40fce342143555dfc03c1fe67b6811
-EBUILD webkit-gtk-2.28.2.ebuild 9143 BLAKE2B 269c31e7fd6834128f1e789c94dc76141ff0ed37a2343e9269abe83f3d4abb28df5ab8ec897c77ebfc8fb91d564c2f8f2587b0486ff2e23074130893eef012a8 SHA512 acef484348d85c05ba25def22036a3692cb4adb9142825e055466fe243d2e624f3f1b899a6f5bd2b0fae893c2adfaf902f3e5f66d4cfc0a7f890ef3eaed03e2a
+EBUILD webkit-gtk-2.28.2.ebuild 9142 BLAKE2B 9a8478488a0bbf4c7247ecefdddd7454789bfeafd3e86b38f53ba49131ecdf7fffd4d6ad4a5ddbf6377d684152dd85a86b5f72ce246caf50cf8c66b2e26f4842 SHA512 3cd9026118609768b8584137bbf4ee47c8e60f1d678df653d7985e336d530af5767af819e34a5663ee4ee4d0fd9cdddc989489f217e469e92780ca3ded8b1e56
 MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
deleted file mode 100644
index 4780125bbb3f..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index 20fa81b568f9..bfb9e1492a69 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 1a34bf7d647a..0340e38c00ad 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -7,8 +7,10 @@ AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-4.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
+DIST xrootd-4.12.1.tar.gz 2564202 BLAKE2B df6334884d12ea68d98f5e8d1c83bb44d9a7d9232f1350323beff8de3815fd24711a90b5180824c9a9fd3f9e4f45ad3448bb32cde57efd646343bf2fd202237e SHA512 8d5c7029ccad8cb898ff41671e6f360154549df926b1fb5e7747503bed477f7bf1daec7addbc5a832b76f0f5c40ef8fdcda708907389fa790c3b87a944af4d93
 DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
 EBUILD xrootd-4.11.1.ebuild 2516 BLAKE2B fda9ae309307fbdc7c6b2996ecc305d310e1750e47f044744e9fc1f15b45b452c0c7b4b1e49f33c15346cc6458462a9b3a19e3af6a72b3e55cb61cf467c3ac8e SHA512 8d386d956d6c323bf54f07d7c02065cb477ff3b2f77fa40f3d894e6a8aa767133c5fec7ee879de530ec6478e8f9bd3ce45b47fb8d13db3c267333f088a8b19dc
 EBUILD xrootd-4.12.0.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
+EBUILD xrootd-4.12.1.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e
 EBUILD xrootd-4.8.3.ebuild 2672 BLAKE2B 6d7ca5ca0dde690749a3f704935c2ea93ab7323fc2bb55a63fd5b4b595f11f2829440e690b2b5decb2fa576926e05901c6b42144914cb4fa369007bd25e3c603 SHA512 7f368cc50498ac135739a2b51dfa13a2501cfc9421dc9f7d92f09fdce1e3868a87b4ac1c68459dfb467bfb2f9f4798ee4eafc2f9b6c19e0609c1a4a0ef7252af
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/xrootd-4.12.1.ebuild b/net-libs/xrootd/xrootd-4.12.1.ebuild
new file mode 100644
index 000000000000..6acdc5a472ee
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.12.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fuse http kerberos python readline ssl test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		python? ( dev-python/sphinx )
+	)
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+REQUIRED_USE="
+	http? ( kerberos ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+
+# xrootd plugins are not intended to be linked with,
+# they are to be loaded at runtime by xrootd,
+# see https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CRYPTO=$(usex ssl)
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doxydoc/html/. )
+	dodoc docs/ReleaseNotes.txt
+	cmake-utils_src_install
+	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	fowners root:xrootd /etc/xrootd
+	keepdir /var/log/xrootd
+	fowners xrootd:xrootd /var/log/xrootd
+
+	local i
+	for i in cmsd frm_purged frm_xfrd xrootd; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+	done
+	# all daemons MUST use single master config file
+	newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+	if use python; then
+		python_optimize "${D}/$(python_get_sitedir)"
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a93092ab86c7..eb29b8028fa1 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 88419769b00a..bdb31e207053 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -9,28 +9,18 @@ AUX 1.8.0/asterisk.initd7 9261 BLAKE2B a0b3740b9d4352bff9489b74aef60847eacb1f2b3
 AUX 1.8.0/asterisk.initd8 9784 BLAKE2B 84558128572f9c3ca3331eda48728613e23ec7d5ebe5a1ef930a1ab125f1e1f2457a13231308506612e98b6c530c7a0d007bb8b673560ee77d078de5fc341d61 SHA512 eb0f316a2fbfbc228a605118b03e213653b94ab1400e50248bd2de5ce436eab9318d486d1c46d7ee8e83c71161d6106605b38bc01d5d4b461f91962749e41ee3
 AUX 1.8.0/find_call_ids.sh 1078 BLAKE2B b480ec9f61453081735e0a1e5176a6de3e6ecc58ec8035b439bd95d64f9e1a5d02fe9810db4ba2e8d20632f186dd91d17c6cdd17a307ddd7802e8aea4638abbc SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9
 AUX 1.8.0/find_call_sip_trace.sh 1115 BLAKE2B d9f5cc559f3dd3fbbb9c50a2b6e6ad30c94521774d3774023d0fd4f51d74b8109b4c9d3eea92c7872532012cabbe892d49aa5261aa4a64b324dff5b679820851 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a
-AUX asterisk-13.32.0-binutils-2.34.patch 573 BLAKE2B a92202c4d07f11b59f68b5b32f8c2240c81d599b0ade14f4a70281bd1bf8b6885e021679bdaf3d5b3594076c15e37be67fa657cbb280a82d437b6064b8ae3243 SHA512 fe54d844aaa1ba5c62199330905bbe614322742b86f93d627c0572093ce1c119cbc88fc96165a1a856c4b4d2f2f56a128951d854777d89e04475f30efa648df7
-AUX asterisk-historic-dahdiras-without-root.patch 668 BLAKE2B 020298676b0e7e195c2c4fc73463a9517263bd4f2b695206609b032f4cd476f8c990dda5dd5157e45012674fc27034d44097259bc96029cb66a1e83ae3b9795d SHA512 11e660c28a5b293719df70488ca656f171a080afb7fde3acb20bbf7e9f250de92391ab3a6e5d2a1ddd0e9551c52cca3a5ef8371b306ce260943c273a3ab6a22e
-AUX asterisk-historic-dundi-null-dereference.patch 1196 BLAKE2B fe3fa097328ca1b4205025ba9a749045490c4aba2cf8242ef755ab359d422d4edddc306b9af61d215800a65d5f4010a37d987b944729a9f5bf45b811ccb61f58 SHA512 c117e999e1ab731dda27da5238b863e3fc1ef0252ba6b20e4651a10c245cb935baa2f150fcd92fc1482ee87f2579b61c6dd5a7992df7ffe6624b60f2d26bb365
-AUX asterisk-historic-invert-gmine-search-order.patch 415 BLAKE2B ff5ed07584ac2fa05792e690900ac207edf61b74fda7515e78783daae31a662484067750c580ca3efcb410cca5b5e6f2af3c8225a62c17194a53dfe0456ffa56 SHA512 a93f25bec0c3564442a95f0ab1904c848bf7f8e08b51a626539d93e6a712ba5f01e1fce7f5e2ce676b28f13d618443afc1a05e0697d8ee1af7617ce52e5b2efb
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
-AUX asterisk-historic-uclibc.patch 734 BLAKE2B 0d1e7bef3b641de0cdf3ba3e146fce63a507860fe8842e15b38937326e1881dd6498ddc89b6d96825132fac52f951cd2508c7b8614c93bd11017b327589015e0 SHA512 ff3872d1e77b609dcbbce702fa000d3431c4592ee41efd959887e0d38c39f93196422c1a1e0d22a7839fe92a68c2a13da81b7f70310863713772c59e5c2cc08a
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
-AUX initd-13.32.0 10546 BLAKE2B 857c44b74a411ab4ef5b9ffafb566f8f81949b40c685807db26d59d8b7233a06c3c55425151937c11f8e1c2d7f72f64674d77cef2bca8b28c5d608d9816905ab SHA512 f22e789bd33576ebb149fb07a623397aeccc2280b6c55ee762f2c95d3622a25d208a06078faf2fefaf0d984a24c00b60eb82da2ae084abb3e3efd90ffa5351a9
 AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
-DIST asterisk-13.32.0.tar.gz 33652378 BLAKE2B c6b0ca0895b25526c135332966f33761b74a88dec4a7b0ff0fe40263640ee2fb928eca29e716fba3cc8e96c6e395e7c70c36f41def6a0d055baac2a5c7b8637a SHA512 daafcd5d3544725e7a96bd467d998c4d74fd3c5d7e9d8fb4ce16e340ce09c502b1603e468e89c5a62b59282848b4ff0a43bdbcd75902cd11f6951d828511e841
 DIST asterisk-13.33.0.tar.gz 33683712 BLAKE2B ecfc122628c08e93fc389f111e1ee8ddcf3d27895437df9da5b83a6440c2135f9223a5605e0ef436e8585f8b023abba5b74680cac97f1700e1bc153872c1ed87 SHA512 b866a63cce7c289d32333b4b3b0a605c413b48fc7518976aa0768dd5c68894348d0de1c9bc7c56b73eb86b69e0fd9847d7226fa0f9e449f8ebb8a7118329db56
 DIST asterisk-16.10.0.tar.gz 27706766 BLAKE2B b8d7866fe3e8420ef5ce6ea5e016316f63e4f2e8904a79de69c4ddfb7aedcd00f09cfb414da43938af0771cdde387dcebfe716eb34e5ed1de3a30ff534459c7f SHA512 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb
-DIST asterisk-16.9.0.tar.gz 27674324 BLAKE2B 991fb0146f5dea338a8c6ad98007e2ac1b182ac2ed7dbabd4143aa7f968dc353563ac4aba18bb07e9b0a705dabd1446319b06f4be284922a804d5c2dbddf6f7b SHA512 b8101fa3cc6068230b6b9a28a558415e7104b9bc3a8c0c245af34e9839cf1eb287739a2142ad0227d2fef41e6d40a5c01128a0b44a7ecaae13a00767d0fa8ab9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
-EBUILD asterisk-13.32.0-r1.ebuild 9796 BLAKE2B 642d4b5a94e3a835e0b82e91717db6f0080a2d119500679bbd106828c6bec1b249e2fc7364bc019256e768dd7e991ea948f92f97b564add03b1511519a762e03 SHA512 445e85c57e6806a6224ffcb03c8e933f198f95ddd5991313afc2af3de24e669bd75a27ee061968229628394b2daf0f0416cb4889f6595e94f9f9a6f569ff377c
 EBUILD asterisk-13.33.0.ebuild 9173 BLAKE2B df9b4d5b2add191db0ea42765ae8f52a2b246761d689b1c8f7191f02475e0dfabe07b6ee318eb8ada7f83a47cf8e928dca46de5d4b898eb5388be89aff5db770 SHA512 461eb01828e69a9e294b0892a2bd01219ae39d51e80567dfbd38e50933f5fe40112c2aba05dc9ce14cad9f511fee92d692966411b032cb0a13d0672566eb6994
 EBUILD asterisk-16.10.0.ebuild 9313 BLAKE2B aa08c101a2531afe02059616da7cc4e621124f86ccbcada647d1f2acdde12bdc80d2abe69a391c06d20ad26416cd3c20187e326ad9689750273b9167bdacd702 SHA512 5d851d212b4edc89addbed9058b4108c5a49e1859bc10bdeb9341b39ed0b6563da335a29c427d95d7609429aeb4beece6c16af1592c0b4026879ca7c9e101715
-EBUILD asterisk-16.9.0.ebuild 9852 BLAKE2B db97375b52ca0d9cae392252e76af9270197c21c986bca673d8c815bf6c38affb1b3fa2c4d5e24d3822097db82d6e2fc661a67a349857c711a74d29f57914f0f SHA512 24f4f001a4c6c683eba65e7cb21678d612995ca6f48d6484a09d43d853209020de4f582cceae86237cf4ad5ea5130baec54161b278faf70fdd873e62d94af5ef
 MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2
diff --git a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild
deleted file mode 100644
index 49dc718b5c0c..000000000000
--- a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-historic-uclibc.patch"
-	"${FILESDIR}/asterisk-historic-dahdiras-without-root.patch"
-	"${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch"
-	"${FILESDIR}/asterisk-historic-dundi-null-dereference.patch"
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? ( media-libs/libvorbis )
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-function menuselect() {
-	menuselect/menuselect "$@" || die "menuselect $* failed."
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--without-libedit \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect --disable chan_misdn menuselect.makeopts
-	menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect --enable smsq menuselect.makeopts
-	menuselect --enable streamplayer menuselect.makeopts
-	menuselect --enable aelparse menuselect.makeopts
-	menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect --enable func_aes menuselect.makeopts
-	menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa         chan_alsa
-	use_select bluetooth    chan_mobile
-	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster      res_corosync
-	use_select curl         func_curl res_config_curl res_curl
-	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds      {cdr,cel}_tds
-	use_select gtalk        chan_motif
-	use_select http         res_http_post
-	use_select iconv        func_iconv
-	use_select ilbc         codec_ilbc format_ilbc
-	use_select ldap         res_config_ldap
-	use_select lua          pbx_lua
-	use_select mysql        app_mysql cdr_mysql res_config_mysql
-	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup    app_osplookup
-	use_select oss          chan_oss
-	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	use_select radius       {cdr,cel}_radius
-	use_select snmp         res_snmp
-	use_select span         res_fax_spandsp
-	use_select speex        {codec,func}_speex
-	use_select srtp         res_srtp
-	use_select statsd       res_statsd res_{endpoint,chan}_stats
-	use_select syslog       cdr_syslog
-	use_select vorbis       format_ogg_vorbis
-	use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-		for conffile in "${ED}/etc/asterisk/"*
-		do
-			fowners root:root "${conffile#${ED}}"
-			fperms 0644 "${conffile#${ED}}"
-		done
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	#
-	# Announcements, warnings, reminders...
-	#
-	einfo "Asterisk has been installed"
-	echo
-	elog "If you want to know more about asterisk, visit these sites:"
-	elog "http://www.asteriskdocs.org/"
-	elog "http://www.voip-info.org/wiki-Asterisk"
-	echo
-	elog "http://www.automated.it/guidetoasterisk.htm"
-	echo
-	elog "Gentoo VoIP IRC Channel:"
-	elog "#gentoo-voip @ irc.freenode.net"
-	echo
-	echo
-	elog "Please read the Asterisk 13 upgrade document:"
-	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
-}
diff --git a/net-misc/asterisk/asterisk-16.9.0.ebuild b/net-misc/asterisk/asterisk-16.9.0.ebuild
deleted file mode 100644
index b7d72507ad54..000000000000
--- a/net-misc/asterisk/asterisk-16.9.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-historic-uclibc.patch"
-	"${FILESDIR}/asterisk-historic-dahdiras-without-root.patch"
-	"${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch"
-	"${FILESDIR}/asterisk-historic-dundi-null-dereference.patch"
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	osplookup? ( net-libs/osptoolkit )
-	pjproject? ( >=net-libs/pjproject-2.9 )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	unbound? ( net-dns/unbound )
-	vorbis? ( media-libs/libvorbis )
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-function menuselect() {
-	menuselect/menuselect "$@" || die "menuselect $* failed."
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISY_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect --disable chan_misdn menuselect.makeopts
-	menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect --enable smsq menuselect.makeopts
-	menuselect --enable streamplayer menuselect.makeopts
-	menuselect --enable aelparse menuselect.makeopts
-	menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect --enable func_aes menuselect.makeopts
-	menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa         chan_alsa
-	use_select bluetooth    chan_mobile
-	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster      res_corosync
-	use_select curl         func_curl res_config_curl res_curl
-	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds      {cdr,cel}_tds
-	use_select gtalk        chan_motif
-	use_select http         res_http_post
-	use_select iconv        func_iconv
-	use_select ilbc         codec_ilbc format_ilbc
-	use_select ldap         res_config_ldap
-	use_select lua          pbx_lua
-	use_select mysql        app_mysql cdr_mysql res_config_mysql
-	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select osplookup    app_osplookup
-	use_select oss          chan_oss
-	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	use_select radius       {cdr,cel}_radius
-	use_select snmp         res_snmp
-	use_select span         res_fax_spandsp
-	use_select speex        {codec,func}_speex
-	use_select srtp         res_srtp
-	use_select statsd       res_statsd res_{endpoint,chan}_stats
-	use_select syslog       cdr_syslog
-	use_select vorbis       format_ogg_vorbis
-	use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	if use samples; then
-		emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-		for conffile in "${ED}/etc/asterisk/"*
-		do
-			fowners root:root "${conffile#${ED}}"
-			fperms 0644 "${conffile#${ED}}"
-		done
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install SIP scripts; bug #300832
-	#
-	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
-	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
-	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
-	dodoc "${FILESDIR}/1.6.2/call_data.txt"
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
deleted file mode 100644
index 6ce797ca4f2d..000000000000
--- a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main/backtrace.c	2020-03-12 07:37:03.000000000 -0700
-+++ b/main/backtrace.c	2020-03-31 23:22:18.272691980 -0700
-@@ -64,6 +64,15 @@
- #if defined(HAVE_DLADDR) && defined(HAVE_BFD) && defined(BETTER_BACKTRACES)
- #include <dlfcn.h>
- #include <bfd.h>
-+#ifndef bfd_get_section_size
-+#define bfd_get_section_size(x) bfd_section_size(x)
-+#endif
-+#ifndef bfd_get_section_vma
-+#define bfd_get_section_vma(x, y)	bfd_section_vma(y)
-+#endif
-+#ifndef bfd_get_section_flags
-+#define bfd_get_section_flags(bfd, ptr) ((void) bfd, (ptr)->flags)
-+#endif
- #endif
- 
- #include <pthread.h>
diff --git a/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch b/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch
deleted file mode 100644
index 1fdf033b7224..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo bug 337297
-Link: http://bugs.gentoo.org/show_bug.cgi?id=337297
-Patch-By: Jaco Kroon
-Committed-Date: 2010-09-16
-Ebuild-Version: 1.6.2.13-r1
-
-Upstream bug 17991
-Link: https://issues.asterisk.org/view.php?id=17991
-Patch-By: Jaco Kroon
-Committed-Date: none
-
-diff -uNr asterisk-1.8.0.ORIG/apps/app_dahdiras.c asterisk-1.8.0/apps/app_dahdiras.c
---- asterisk-1.8.0.ORIG/apps/app_dahdiras.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/apps/app_dahdiras.c	2010-10-27 00:50:00.000000000 +0100
-@@ -119,8 +119,6 @@
- 		c = strsep(&stringp, ",");
- 	}
- 
--	argv[argc++] = "plugin";
--	argv[argc++] = "dahdi.so";
- 	argv[argc++] = "stdin";
- 
- 	/* Finally launch PPP */
diff --git a/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch b/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch
deleted file mode 100644
index 8fb531937989..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream issue 21205
-Link: https://issues.asterisk.org/jira/browse/ASTERISK-21205
-
-Submitted upstream:   2013-03-05 07:06
-For Asterisk version: 11.2.1
-Patch by: Jaco Kroon
-
-If a negative (error) return is received from dundi_lookup_internal, this is not handled 
-correctly when assigning the result to the buffer. As such, use a signed integer in the 
-assignment and do a proper comparison.
-
---- a/pbx/pbx_dundi.c	2013-03-05 15:07:00.523387892 +0200
-+++ b/pbx/pbx_dundi.c	2013-03-05 15:18:49.512625981 +0200
-@@ -4123,7 +4123,7 @@
- 
- struct dundi_result_datastore {
- 	struct dundi_result results[MAX_RESULTS];
--	unsigned int num_results;
-+	int num_results;
- 	unsigned int id;
- };
- 
-@@ -4255,7 +4255,7 @@
- 	drds = datastore->data;
- 
- 	if (!strcasecmp(args.resultnum, "getnum")) {
--		snprintf(buf, len, "%u", drds->num_results);
-+		snprintf(buf, len, "%u", drds->num_results < 0 ? 0 : drds->num_results);
- 		res = 0;
- 		goto finish;
- 	}
-@@ -4266,7 +4266,7 @@
- 		goto finish;
- 	}
- 
--	if (num && num <= drds->num_results) {
-+	if (num && drds->num_results > 0 && num <= drds->num_results) {
- 		snprintf(buf, len, "%s/%s", drds->results[num - 1].tech, drds->results[num - 1].dest);
- 		res = 0;
- 	} else
diff --git a/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch b/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch
deleted file mode 100644
index 99e76d947fb2..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-13.18.2.ORIG/configure.ac asterisk-13.18.2/configure.ac
---- asterisk-13.18.2.ORIG/configure.ac	2017-11-14 11:26:06.179850146 +0000
-+++ asterisk-13.18.2/configure.ac	2017-11-14 11:27:46.256844611 +0000
-@@ -2503,7 +2503,7 @@
-     fi
- fi
- 
--for ver in 2.0 2.2 2.4 2.6 3.0; do
-+for ver in 3.0 2.6 2.4 2.2 2.0; do
- 	AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver)
- 	if test "$PBX_GMIME" = 1; then
- 		break;
diff --git a/net-misc/asterisk/files/asterisk-historic-uclibc.patch b/net-misc/asterisk/files/asterisk-historic-uclibc.patch
deleted file mode 100644
index 167ae080b193..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-uclibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo bug 66557
-Link: http://bugs.gentoo.org/show_bug.cgi?id=66557
-Patch-By: REdOG
-
-Submitted upstream: No
-
-The uclibc environment, as opposed to the glibc environment, needs explicit 
-linking with the pthread & dl libraries. Without these, name resolution is 
-not functional.
-
---- asterisk-1.8.7.0-rc2.orig/Makefile	2011-08-25 21:00:55.000000000 +0200
-+++ asterisk-1.8.7.0-rc2.orig/Makefile	2011-09-21 14:13:12.823076046 +0200
-@@ -247,6 +247,10 @@ 
-   _ASTCFLAGS+=-pthread -ftrampolines
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
- endif
diff --git a/net-misc/asterisk/files/initd-13.32.0 b/net-misc/asterisk/files/initd-13.32.0
deleted file mode 100644
index 6d1f77e51b9b..000000000000
--- a/net-misc/asterisk/files/initd-13.32.0
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="forcestop reload"
-extra_commands="checkperms"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-# ast_spooldir: 
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/var/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_spooldir=/var/spool/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME/.//}
-	ast_stop_timeout=120
-	ast_stop_method="gracefully"
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename+="(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
-	case "${ASTERISK_STOP_METHOD}" in
-		grasefully|when\ convenient|now)
-			ast_stop_method="${ASTERISK_STOP_METHOD}"
-		;;
-	esac
-	ast_group=
-	if [ -n "${ASTERISK_USER}" ]; then
-		ast_user="${ASTERISK_USER%%:*}"
-		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
-			ast_group="${ASTERISK_USER#*:}"
-			ast_group="${ast_group%%:*}"
-		fi
-	fi
-
-	[ -z "${ast_user}" ] && ast_user=asterisk
-
-	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
-
-	return 0
-}
-
-checkperms() {
-	setup_svc_variables
-
-	local path
-	checkpath -d -m 0755 -o ${ast_user}:${ast_group:-${ast_pgroup}} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
-	for path in "${ast_rundir}" "${ast_spooldir}" "${ast_logdir}"; do
-		ebegin "Checking ${path}"
-		find "${path}" ! -user "${ast_user}" | while read element; do
-			[[ "${element}" = *.gz ]] && continue # Skip logrotated files.
-			ewarn "${ast_user} is not the owner of ${element}, or permissions are insufficient, fixing."
-			chown ${ast_user} "${element}"
-			chmod u+rwX "${element}"
-		done;
-		eend 0
-	done
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing ${ast_instancename} wrapper"
-	OPTS="$*"
-
-	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
-	touch "${ast_rundir}/wrapper_loop.running"
-
-	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F "${TTY}" sane
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
-			result=$?
-		fi		
-
-		if [ "$result" -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ "$result" -gt 128 ]; then
-				signal="$(expr "$result" - 128)"
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-"
-				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
-				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 "$(pidof "${X}")";
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >"${TTY}" \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS PID
-	local tmp x
-
-	local OPTS ARGS 
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# ensure that ASTERISK_RESTART_DELAY is integer.
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	else
-		NICE=""
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in "${ASTERISK_TTY}" \
-			 "/dev/tty${ASTERISK_TTY}" \
-			 "/dev/vc/${ASTERISK_TTY}"
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : Yes"
-		OPTS="${OPTS} -c"
-	fi
-
-	if ! getent passwd "${ast_user}" &>/dev/null; then
-		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
-		return 1
-	fi
-	OPTS="${OPTS} -U ${ast_user}"
-
-	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
-		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
-		return 1
-	fi
-	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
-	
-	if [ "${ast_user}" = root ]; then
-		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	elif [ "${ast_group}" = root ]; then
-		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	fi
-
-	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
-	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
-		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
-			# asterisk can crash during startup ...
-			ebegin "Waiting for ctl file to appear"
-			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
-				sleep 1
-			done
-			is_running
-			result=$?
-			eend $result
-		fi
-		if [ $result -eq 0 ]; then
-			ebegin "Waiting for ${ast_instancename} to fully boot"
-			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
-			eend $?
-		fi
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
-		ebegin "Killing ${ast_instancename} wrapper script"
-		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "${ast_instancename} is not running!"
-		return 0
-	fi
-	
-	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for ${ast_instancename} to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 2)"
-			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
-				echo
-				eend 1 "Failed waiting for ${ast_instancename} to stop."
-				return 1
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Forcing ${ast_instancename} to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "${ast_instancename} is not running!"
-	fi
-}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 81cef2862ad2..83751c3f3abe 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,6 +1,3 @@
-AUX axel-2.4-bffr-overflow.patch 333 BLAKE2B 67dcc951faf0090673d2e5ff48291b28981ea401052602b2e3c054d1d0485e02d4acc22699c08ac0fabcc2402450d9ce7bceadc0e428234a7e1446c441d9df3a SHA512 8072f7a7d15028f2272e45f6b42704fb3cadb30aec1ade093c80ee3b5d983d6362ed426c529bf46864f3f1adf8d2cd582be632796c8abcb43b125db87b1f0f75
-AUX axel-2.4-buildsystem.patch 566 BLAKE2B 47dd700ec0506824ff2bc3509a6c43cbd0b0b6c1676cb0600ec0ed96d4fd3f0daf7ccd3619f277c6bc7961fc3aeca18f12174bceb3cecd58b259d63f5520db7e SHA512 5a6d087a959adb88aed6ae7df602e3731c9a6773877eb731e670ab854c20fd0e41e24a91b759192882ccb9c5dff2a07d51f73b5e5cbb868f25b0aa991b6af428
-AUX axel-2.4-max-redir.patch 412 BLAKE2B 62146c6f0da6fdff0fe89aeeb487094020b04eee4d7ffbe223217910e32b81a5fadfb5a9e90a1602ee0ad80e6da47b2948b8eea534ef2cda53602fc8b753f9a5 SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491
 DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
 EBUILD axel-2.17.7.ebuild 1260 BLAKE2B 1f976957b0425607de9728fc358454134191a4d0d136700d144d19f4348bead0e3167221091f9bd458d631f2bc09d5c9b4034175517659249174923bbd87ea69 SHA512 c5e24d64e0b781e7caa596eee0c82ee78a7d3fce9d8557e13a88c89a4eefe414e054ff4d80b5d9672d2cf9155575ae2fadfab15fb12e625daafda57231bf3cd8
diff --git a/net-misc/axel/files/axel-2.4-bffr-overflow.patch b/net-misc/axel/files/axel-2.4-bffr-overflow.patch
deleted file mode 100644
index 24fae8ce19c0..000000000000
--- a/net-misc/axel/files/axel-2.4-bffr-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- http.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/http.c b/http.c
-index 5d64e9b..db91701 100644
---- a/http.c
-+++ b/http.c
-@@ -164,7 +164,7 @@ int http_exec( http_t *conn )
- 		{
- 			i ++;
- 		}
--		strncat( conn->headers, s, MAX_QUERY );
-+		strncat( conn->headers, s, MAX_QUERY - 1);
- 	}
- 
- #ifdef DEBUG
diff --git a/net-misc/axel/files/axel-2.4-buildsystem.patch b/net-misc/axel/files/axel-2.4-buildsystem.patch
deleted file mode 100644
index a1571f0fc576..000000000000
--- a/net-misc/axel/files/axel-2.4-buildsystem.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1c3863a..b43fcff 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,13 +51,13 @@ uninstall-etc:
- ### MAIN PROGRAM
- 
- $(OUTFILE): axel.o conf.o conn.o ftp.o http.o search.o tcp.o text.o
--	$(CC) *.o -o $(OUTFILE) $(LFLAGS)
-+	$(CC) $(LDFLAGS) *.o -o $(OUTFILE) $(LFLAGS)
- ifndef DEBUG
- 	-$(STRIP) $(OUTFILE)
- endif
- 
- .c.o:
--	$(CC) -c $*.c -o $*.o -Wall $(CFLAGS)
-+	$(CC) $(CPPFLAGS) -c $*.c -o $*.o -Wall $(CFLAGS)
- 
- install-bin:
- 	mkdir -p $(DESTDIR)$(BINDIR)/
diff --git a/net-misc/axel/files/axel-2.4-max-redir.patch b/net-misc/axel/files/axel-2.4-max-redir.patch
deleted file mode 100644
index f52796c35e2d..000000000000
--- a/net-misc/axel/files/axel-2.4-max-redir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- axel.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/axel.h b/axel.h
-index e90d30d..f6ebfe8 100644
---- a/axel.h
-+++ b/axel.h
-@@ -66,7 +66,7 @@
- /* Compiled-in settings							*/
- #define MAX_STRING		1024
- #define MAX_ADD_HEADERS	10
--#define MAX_REDIR		5
-+#define MAX_REDIR		25
- #define AXEL_VERSION_STRING	"2.4"
- #define DEFAULT_USER_AGENT	"Axel " AXEL_VERSION_STRING " (" ARCH ")"
- 
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index c1bf3aace16b..0282b746e42b 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -2,8 +2,10 @@ DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952
 DIST cni-plugins-0.8.3.tar.gz 2001599 BLAKE2B e087814146c53d372af5b1cc47098f0060cb1528618d9848287592c0b442856114c711ea747efca4e8a79e9ee0b4285678a6e48e07d0698f1382c1e822a49451 SHA512 054479a73ddbfbdb2986ac202ae2da7a69ae7bb693a250885f950a26973c60be3053d4e95ca24cf5eb67c104b9af8231f859e22c01a066ce3a206a186fc55a6d
 DIST cni-plugins-0.8.4.tar.gz 2002863 BLAKE2B afc0229256f04b5079ff4f30fca422e7e72dc46b01a988b38647bbed767ad4c8362c99eca84ade86a52ffbd3aadda60ae1b14974436eab862d4c9ed356320b2b SHA512 1a66a9d2cc3bad17201426905ed8349fa0c260ffef423338bc93c4ff191c4d38e6b9228ca3b5c44b148c854379f741f2dbd88ac9937dc1599f95f4df8b6f4346
 DIST cni-plugins-0.8.5.tar.gz 2003900 BLAKE2B e14ee6ca6979b638ed041a28d382867006b05843bf5b2c9c79386f4db590684b047af226a11b49e75b750e63927f3ee672cec54f12a1c7447550b8755a96b0bb SHA512 e404ef69da189e2cc3e77ae1054fbea5232086066f2963d1ec824f63c02aede020ad8600d821ec47ae695043bd2c4a176d9e02b9a059024ff3a2fbeee9cb797a
+DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
 EBUILD cni-plugins-0.8.2.ebuild 1180 BLAKE2B 65c6677411bba468a5c77361326aff928a83651e3b7326391724e83a3f7c5fb89b81819d2e12217e2fca64568ce53f1aa0714fe7cf05a8cbfb3a4378687d43c3 SHA512 2a390ea446112f068067d6e5d40e5a2d96242d772593856a1cb727c424ac0afa4e3e0dabf53fbecdea0613873f72d0d3018a72444ae58235a5e69905b800be4d
 EBUILD cni-plugins-0.8.3.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5
 EBUILD cni-plugins-0.8.4.ebuild 1182 BLAKE2B 45476f645c86ca1518bf46315df141f515468c710f7fc78f792ec8ea10d0ddce300c8a645c07ba033833260e8e9f9ca77bdcd23c0a8c39b42161689c033d248a SHA512 a8099a79a4f6f2540a3e735eedf7688233d9f04cb77f682574d2492025998be573e864d02104d987e9e6c5ba72db9ff91c3fecf6af730bf191ab878b036d018c
 EBUILD cni-plugins-0.8.5.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85
+EBUILD cni-plugins-0.8.6.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
new file mode 100644
index 000000000000..999026880609
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 11a3b6a24dc7..a0eeb85c84b2 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,10 +4,13 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST dropbox-lnx.x86-94.4.384.tar.gz 94254443 BLAKE2B 4d12d0268ea71f4d06304dbe29bcd54f3af4c39e10ba8be4892724c6dc556dd844e587f789cc957dad66d7bd44ae8fdac398cefbfb714a8b01d7f8c06b1d6d50 SHA512 710af644cdaf88a6db26f86b2cafd1bb729b4cd52aab4a3328c9c3061183db32db016adb6d8dc9c5a2fc860a55c3abc712a774ac3e635459c605e91c0178c37e
 DIST dropbox-lnx.x86-96.4.172.tar.gz 95619165 BLAKE2B 3d839e3ea9e1b9a7399693e8540230a8bd173b1cbe7fb9ee3a85621f6a3c59bc8c2c58d2f8e0f0998dcd9b0d77cbfcb006c9b543609546efca6ae8d85817b5ee SHA512 83ee64f7db74742c375fca8fa661da0774c3ec451cfe6cc71e5879427e8f822ae9f533ca2920bc01158b05dd52fac9f89fb3bd8928a2a71c4df4162f67547e22
 DIST dropbox-lnx.x86-97.3.451.tar.gz 96560209 BLAKE2B 9ca8b50afddb8e0435cc1e408fdb10a12a1097baebf7241033661ac26e5d8c369b09bb6dfe707d1f0f3f6a79832ff0ae097eed859b0a3612574fb69d9d74fd47 SHA512 d50ba534f3b7b87755d09ffb216cc8741f0d520c088577fbda486aa4debd7317fd87fa7a86a0131800b1cdd75a60f2ee6c1b7d264a8e75b11d7d619e509f221e
+DIST dropbox-lnx.x86-97.4.467.tar.gz 96556504 BLAKE2B 1959c134126870e2d86b925766db9466be49fa0f71caeadac79f529194e85afeb4b45e47507a6786a2dc91cdb1cd976ec02110dac2c9d2abd71d789fd81204ac SHA512 fa056a96c1dd68f8c691c21b73d6d7159472616d2d67611a7ee01cb9b6bc4eeceed04087cb77114d6a62a715cbe82f828c6e75e4e92d3a4ce88ca7bbc2d71dd4
 DIST dropbox-lnx.x86_64-94.4.384.tar.gz 98561877 BLAKE2B ff1ec6a8f76b9b79ed3cfe34d5dd5642886d01631bba062ba15528929e1068425fadc403c8a7fb3242b08c2d2742a2f4ccd255c8772691ee1e4f1b8693be4dcb SHA512 e905b283ef435d7b6c0d7973f49e8c0a4a5e7c25c2570967b24bb8476ef1889f63d01e7951f1c6d78a5c6851e1a30737b9297032dede1540e3bf391c56bc0c8b
 DIST dropbox-lnx.x86_64-96.4.172.tar.gz 99944904 BLAKE2B 0b9b6c3d283de2751df9c083f7cf4ec8bd013def2a6cacc1a006e5a66ef5d0451d5c1faef3b10d7295ff3c23b941e48248126064e9eab6391e11ad7c193ebb01 SHA512 1aaf4b3e88e047f184af813d80e7754649ab33f2337ae1555c7d408d3358195e48cb0b1daaae1fe6f8a1e572ea087960eb2bda2413158f60588e022f5f01136f
 DIST dropbox-lnx.x86_64-97.3.451.tar.gz 100909755 BLAKE2B 75de9da05ebdb1c1da0d604d8e7aff3fd1fa5a6b9f281cb8ae20f673ea05f0a4af775d6c5926fc5962782c896a71aaa48651c7b49e05ed4bc783f64275b1fcce SHA512 501e8754717a91b1fe01ebe5f895341b3ab74da97633faadf3bcf81735672efd6beffa87125aad7e32e851ef656cf5ba8951e57ecc6180a2f3b77af37a629e65
+DIST dropbox-lnx.x86_64-97.4.467.tar.gz 100899563 BLAKE2B 0ab7b98d9e1394ce997aa456157a85586addb0c82f47d831721bd36a716cb3117b280e2753040369bc04d5a0360a3861a34e9381dcba747fdb4a38e11d4dd34a SHA512 05ddc063c9dcfb8b9b03f93f0b298b53d90702aef25ce44254efc1e7b21c0e767702c91cbfa3b1876a4c32980f80dd34eaf40453d76d093635df17818f663c9c
 EBUILD dropbox-94.4.384.ebuild 2561 BLAKE2B 9c6df8557694385a3817b26c068731524c3cfd72b8fc6514be8fd1646ee1c7073a101cc24e82f5dae9bc16fdb2cebcdad621d8d9a963aaa486659b2adc32b7ec SHA512 5de8951c0dfb17269b659ed76fc3260c93e1c2c3ea91f3a1070cb7b2b02a15b252696ecf4d8223d1d3cc1f46df08d9ba2c365a177c4c9632e1a129c054428188
 EBUILD dropbox-96.4.172.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 EBUILD dropbox-97.3.451.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
+EBUILD dropbox-97.4.467.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-97.4.467.ebuild b/net-misc/dropbox/dropbox-97.4.467.ebuild
new file mode 100644
index 000000000000..38f892d3ba40
--- /dev/null
+++ b/net-misc/dropbox/dropbox-97.4.467.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index c80e6f54a45b..facd783fd331 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -7,6 +7,6 @@ AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
 EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-EBUILD endlessh-1.1.ebuild 1273 BLAKE2B 26818f880049315c57b94bc1609a80de6e36ced2c59bef26fe48cedeedfeca40287de5db60faf65eca27c90cc621d3ee75b566e8f1d6eb4936e1db7ff612fb94 SHA512 b0fc2fe1419ea01d66e3b672d48e5ad3cfe6b5a168b520412432677f67604ce5c2bce635e19369e79e8041d24d40b6aa7ff431db909f6c79589759241079a7c3
+EBUILD endlessh-1.1.ebuild 1280 BLAKE2B d543e35271f1bfc4c7616e12a3cd4093aa85879a4184c8dd02a3c91204f12ed9c8c4cfd654a91cb112ca8688219ca2f56284e0848543f773ce37aae851a9b97f SHA512 9fbbfb758374d49b0446cdd3142f58d021bf306cce7fc9b8504ddbb7a03b10f96605146f729111edd3450bc7f8bb5624980e743c48d80a7c063e0f2308136cd9
 EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
 MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1.ebuild
index f79dee7a10e3..076f1f1161cc 100644
--- a/net-misc/endlessh/endlessh-1.1.ebuild
+++ b/net-misc/endlessh/endlessh-1.1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 5424706184d1..47ddae77b23d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,8 +1,5 @@
-AUX 2.0.0-backports.patch 3717 BLAKE2B a80d2fd291f4a2c94253cc41b50610b0f6116181853fd8ca07c88b17c816156f69a168347633651b23bdd8e6d65e583e03d1f7f8e9d8d26e04daee34a165506e SHA512 e8fab560145ed73d28aaeb93cbf8ada68a76ab7ee3e0cbb9f65f157a935a1c312bc6e9c188e4bca83b1e64d00af93fa39b9ab0d1fdb558936aa2d2b0738155a5
-DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
 DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
-EBUILD freerdp-2.0.0-r1.ebuild 2942 BLAKE2B 0f2aa9737cfd68caf4012beb385e25ac6464fc067eb40ebeb2f3c2196183c192cb85f1d92e2947f1a5555d9d280d68e8b960dd9bbc50105472003df97c62f758 SHA512 0a4e542307b57033c840d8e0b2c59b2befae7dc732e82f58e4af13fe56088efe01459f09315487e53d3c0aea55cde722a13e4e44efd804de19a8b5fc3b69c692
 EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
 EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
-MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
+MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/files/2.0.0-backports.patch b/net-misc/freerdp/files/2.0.0-backports.patch
deleted file mode 100644
index a1cf36539fd4..000000000000
--- a/net-misc/freerdp/files/2.0.0-backports.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Fri, 10 Apr 2020 14:11:15 +0200
-Subject: [PATCH] Fixed return type for subsystem entry
-
----
- channels/client/CMakeLists.txt                 | 2 +-
- channels/client/tables.h                       | 2 +-
- channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
-index a0d3a73581..eb0c80f129 100644
---- a/channels/client/CMakeLists.txt
-+++ b/channels/client/CMakeLists.txt
-@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
- 			set(STATIC_SUBSYSTEM_ENTRY "${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry")
- 		endif()
- 		set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ \"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", ${STATIC_SUBSYSTEM_ENTRY} },")
--		set(SUBSYSTEM_IMPORT "extern void ${STATIC_SUBSYSTEM_ENTRY}(void);")
-+		set(SUBSYSTEM_IMPORT "extern UINT ${STATIC_SUBSYSTEM_ENTRY}(void*);")
- 		set(CLIENT_STATIC_SUBSYSTEM_IMPORTS "${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}")
- 	endforeach()
- 	set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};")
-diff --git a/channels/client/tables.h b/channels/client/tables.h
-index fd998a6ae1..b6b3f9ca27 100644
---- a/channels/client/tables.h
-+++ b/channels/client/tables.h
-@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY
- {
- 	const char* name;
- 	const char* type;
--	void (*entry)(void);
-+	UINT (*entry)();
- };
- typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY;
- 
-diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
-index 67360ad430..7509326c22 100644
---- a/channels/urbdrc/client/libusb/libusb_udevman.c
-+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
- #else
- #define freerdp_urbdrc_client_subsystem_entry FREERDP_API freerdp_urbdrc_client_subsystem_entry
- #endif
--int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
-+UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
- {
--	int rc;
-+	UINT rc;
- 	UINT status;
- 	UDEVMAN* udevman;
- 	ADDIN_ARGV* args = pEntryPoints->args;
-@@ -922,5 +922,5 @@ int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p
- 	return 0;
- fail:
- 	udevman_free(&udevman->iface);
--	return -1;
-+	return ERROR_INTERNAL_ERROR;
- }
-From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Fri, 10 Apr 2020 14:16:19 +0200
-Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions
-
----
- channels/urbdrc/client/urbdrc_main.h | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h
-index 5ec839983b..749aaf8727 100644
---- a/channels/urbdrc/client/urbdrc_main.h
-+++ b/channels/urbdrc/client/urbdrc_main.h
-@@ -222,14 +222,12 @@ struct _IUDEVMAN
- 	UINT32 status;
- };
- 
--enum
--{
--	DEVICE_ADD_FLAG_BUS,
--	DEVICE_ADD_FLAG_DEV,
--	DEVICE_ADD_FLAG_VENDOR,
--	DEVICE_ADD_FLAG_PRODUCT,
--	DEVICE_ADD_FLAG_REGISTER
--} device_add_flag_t;
-+#define DEVICE_ADD_FLAG_BUS 0x01
-+#define DEVICE_ADD_FLAG_DEV 0x02
-+#define DEVICE_ADD_FLAG_VENDOR 0x04
-+#define DEVICE_ADD_FLAG_PRODUCT 0x08
-+#define DEVICE_ADD_FLAG_REGISTER 0x10
-+
- #define DEVICE_ADD_FLAG_ALL                                               \
- 	(DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \
- 	 DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER)
diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
deleted file mode 100644
index d4c577fb18e5..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/2.0.0-backports.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 22b0a0566617..16127826173c 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build client binaries</flag>
 		<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
 		<flag name="server">Build server binaries</flag>
 	</use>
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 37a57e1f4f5c..de72e03c882d 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,11 +9,7 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-DIST memcached-1.6.2.tar.gz 536527 BLAKE2B e350ee10ed74d68206baa009fa49e30e6563a21fd617fc30c1c2695642f6a5f85662acc40471d903a54c26153ca904d1ce9fb3bcbc7bae5d06431069872ca812 SHA512 e695c1292fc85280be3d337990c37f6fcf85e1a73870d541b993335b12f33b31516b477c30169a40c7b5d24fac8c842fdc5f1f48348c5cafa593040229349640
-DIST memcached-1.6.3.tar.gz 538890 BLAKE2B 06d18dcfa00bead3d0d5e46a2660568544b0e6bf27b4f2c1759d9bf8170c0b5b78028303a530d651b4002053ec747b4c6a2dabc231b57cbbfa276ff1cc59f9f1 SHA512 f51248906f59eca3025dd8b56adcd49dcacbf706f66b0fbdafeb054a213d5595a8e13dc38a365cf852d3b1058f90a981f464e24025a4f33dccd09aa579f7cbbd
-DIST memcached-1.6.5.tar.gz 539962 BLAKE2B 2abe351d09a29c98a6a7710f05d1934d9733366e32489137f281558abefa6183e66ac4b1acf44af5c1772123ffa032f460bf796acb6258a908d6ef1e38262f88 SHA512 e6cc2db70bbd05dd40131ca9e0cbbc72c41d747f64b6e6e6c2e3ac2630b67fefcd5e945b2e8d57db6d0b379ba9c34d89eb2c19f20391493e4e2390d7a1616d90
+DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
 EBUILD memcached-1.5.22.ebuild 2956 BLAKE2B 149c5f1c78050f0b36086811f632ead56840a56edec63b1da22a3642c223b6fbe9eb01b55dd5f032cfad3ce540d6eeb68e34787dfca382c921fa85cc324033f2 SHA512 e05ce60c58028f51ef572dde0319d669aa9aa21c227cf7490bee0a9678144b3f11fe0a525421a2ae1c016cf0027d74bd3ec861c7aa1d83119a2d16301f29b490
-EBUILD memcached-1.6.2.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.3.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.5.ebuild 2930 BLAKE2B fba7f67a43a2ea72b645b7d0aef5060511969c0df68c7f1665b395a470a4126266f26125f4de65a7658903b01be687870acd238660c99b289c1b7d7237738547 SHA512 1e31e348a5624ed5e47d6218615f6e3c8bb9f5e853d1bd12548e4c1ed4b09ac221832e06f38a4580a93080c816fac729ba8d5acd3106b19085bb1fb4f0999783
+EBUILD memcached-1.6.6.ebuild 2890 BLAKE2B c91614a11022713c534524fc053b9d669aaf716ac47b7197c0732077ed31cb7a8e27a0240fd785542cec44fe5fc7afa1b36e5f50cc96e17bb194e3fc80835ea4 SHA512 e22a7b8a8e7ff6733ba5380e2765f935b313f09eef93f5df292924078a8781f710f5e6085a5efef6a35358f50a7c174c0d2c425709d5372536de035a2f626b9b
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.6.2.ebuild b/net-misc/memcached/memcached-1.6.2.ebuild
deleted file mode 100644
index 75cbb9370f34..000000000000
--- a/net-misc/memcached/memcached-1.6.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.6.5.ebuild b/net-misc/memcached/memcached-1.6.5.ebuild
deleted file mode 100644
index 206190e3a929..000000000000
--- a/net-misc/memcached/memcached-1.6.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	"${FILESDIR}/${PN}-1.6.5-ia64.patch"
-)
-
-src_prepare() {
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.6.3.ebuild b/net-misc/memcached/memcached-1.6.6.ebuild
similarity index 95%
rename from net-misc/memcached/memcached-1.6.3.ebuild
rename to net-misc/memcached/memcached-1.6.6.ebuild
index 75cbb9370f34..3ff5cfe1d936 100644
--- a/net-misc/memcached/memcached-1.6.3.ebuild
+++ b/net-misc/memcached/memcached-1.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 67d6986a3d4b..6b9306631718 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,7 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20200329.tar.gz 243725 BLAKE2B a9ca048744bc8f397e10bcc5e27638285d0000700855952cce4c2ba7959b2c9099e18045bd5e9103c67da79c90d04a2e505e064bcb1bbca5574437d4625101a5 SHA512 3f6a1a6f08924505a6db5ca5b1dbf7c59f8b48647c59a600799b020146422497248367767e41df0715bd9774129f2d8f95c4a63493af2db849bbe006231e6edf
+DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
 EBUILD miniupnpd-2.1.20200329.ebuild 1973 BLAKE2B 37124c901c4055cca0a10b90e135fb31a85bb90f40d330ec765d28c9742173c38f856ebbde4cdf9e9f40c759ec090b53732fe4814b4297a2e6ef8b907a454e43 SHA512 2cad4ddaa9ea78cc1c8425499a268164fe4f4d93d34c27c5d88693946262a4490a9ff8047984dda9d7088ca82ed2a95e63c04ca5ee971e4eb014341f733005ba
+EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
new file mode 100644
index 000000000000..b208d8cce8f8
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 888e690f85d1..998bc5d5c8be 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 9798ac69a58f..927d5b027dc3 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,4 +1,3 @@
-AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
 EBUILD gtk-gnutella-1.1.15.ebuild 1889 BLAKE2B db599d86c14d85badd9d7290c9b717a9b19376c26d233d15d5b75de6c66fa828162ae554bc01e14b418f3555c414df1912f02a70f1e92ba028a63e61e65ea2ee SHA512 c5efa25051678b375791fbd30f7bad7886a4dcc155f8b22fd5af43c898614f84c1a3c6c048e0c379e6b3d6b95d0a0c8b68cd12ab38bf2aa71a72fb35a413304c
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
deleted file mode 100644
index 5d455887c04f..000000000000
--- a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/lib/stats.c b/src/lib/stats.c
-index 8d0d87b8b..725986268 100644
---- a/src/lib/stats.c
-+++ b/src/lib/stats.c
-@@ -50,7 +50,7 @@ enum statx_magic { STATX_MAGIC = 0x560044e5 };
- /**
-  * A one-dimension container (x).
-  */
--struct statx {
-+struct statistics {
- 	enum statx_magic magic;	/**< Magic number */
- 	elist_t data;			/**< Data points */
- 	long n;					/**< Amount of data points */
-@@ -60,7 +60,7 @@ struct statx {
- };
- 
- static inline void
--statx_check(const struct statx * const sx)
-+statx_check(const struct statistics * const sx)
- {
- 	g_assert(sx != NULL);
- 	g_assert(STATX_MAGIC == sx->magic);
-diff --git a/src/lib/stats.h b/src/lib/stats.h
-index ba876467c..2a67952e2 100644
---- a/src/lib/stats.h
-+++ b/src/lib/stats.h
-@@ -40,9 +40,9 @@
-  * One dimension statistics.
-  */
- 
--struct statx;
-+struct statistics;
- 
--typedef struct statx statx_t;
-+typedef struct statistics statx_t;
- 
- statx_t *statx_make(void);
- statx_t *statx_make_nodata(void);
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 11c3fd16ac2a..eadd2d4b52aa 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -18,6 +18,8 @@ DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip 14852 BLAKE2B 33a7c997772bc0ab89312c06940938a0e447b81d5613c95585ec3cf395189edaa92a8e9801649f91ebf9e65dad30af94725436d5849ca1277ec4126989d3b023 SHA512 55765137bbfcb45b4c9962044502458f1e7944487946604fbc7604d48b9b576c522b9316a99cb14dacc3c613c99ddb9c51f1a9cd92f4a729bdf76b834d7d2fba
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
+DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.mod 45 BLAKE2B 451da80b89b0c53a48baa253fb4899701b97286de7c2fd501aa17d5776c5013a9e888a36075d4b1eda1c9c4bc123f64a007e7555d09b6ec3d828d9b15d3ef2a8 SHA512 3f616622bf613f062fd222135532d4ffdcf94dfa5dffa1966619f55c446aa8186ad38470b0c23a68d0cd1de7b0b3f2b4471a1cc61ba73e27311702366befdae8
+DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.zip 5901 BLAKE2B 0d89542d018a40bd92a755a630c6b528679b853671b018fedd5934e271528f8cba2a7c121ec8be4306732a795482c161e301fa578b2f50970c555ffb45a03eb9 SHA512 26eee92b278a89ea30eb1bd9c105dff9d96d662d7d3b4ff255caf3fce6a7ec660fb3f01e3209ccb66358d70cf7cb9354027dc85824f54a7a2b81f889028823f4
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
@@ -59,8 +61,12 @@ DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod 37 BLAKE2B f12e861904648d4931055fc40635565ba64e9e43909af9b6a238105ee85b98a01fc31da46c6ad7b737162f88648d4efe30f428a7d253cdcef7c38e9ff3863d5d SHA512 b10d9112b673106e50e51a54496b9f82af44ded3ae88811eefafcc0c1908b7fc89a1512d438a04748147326beb28026e01ca3e4dc3e833be7cb3d2b49d98e81f
 DIST github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip 26210 BLAKE2B e7d3ba9ba27946dcb3f7ac50b439849fcd56ddc1fc1bc9925892c6ab2c28b5a1a94aa3a8b940e6799f6f601bf6620efe0cae8c1dc4c89c8018c4637860b59672 SHA512 51752c4fc76e160d0a3c5a9efb627f15d16c9b9a005a93e7a5c44f374d18e932ca5219debcd89900225a3cc2bcfd5842c59195f5ad3d8217a5d35d19bd053fdf
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.zip 27991 BLAKE2B 16de59a646f413d826d20767c04d7798dc94bd609006a62c9c955593acde14a44463be06c2284c16e6f72a3a6150a9c993eab739ccbcb0c3169e9058dec5d170 SHA512 9751a484559783aa997d2c60904e477db2f66bd39d2ab3ef84ac55583b376c7277dfd5aede2d4f2766474b9209e1733cf45098ad6879c938a830ca018e2c9927
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod 91 BLAKE2B 5246926cf56768959aa69eff9fcc70c7a880bfe1879c03dc933d798595640dc81ff1d018a4e05f5867de5afb40407b4c2803e883b8eef005b1d6e1ef3f1e7bee SHA512 03e84e2a11f843cf54622151d4e65aaa1a783a258250acb54fd432d9f175fc1a6c92db5ebe11f6e35a8deed537a805cbf2104b57beda3b34e96ebb2c499a768a
+DIST github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.zip 51040 BLAKE2B 087d0721061dc7f7da7f7c8d4a0072cc8bb342f83947e98939868a3074029b69a152f55657ee7ae5ca5045787fb125931321c09175abca345b7da627dd542828 SHA512 95a1145399fd9d0fa9c028538c0a66d190008e391a3dc9195086667fccca0720f85ec67660c99badc092402003e8ebb4a4458f0f0902721037a937194d0ad417
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
@@ -95,6 +101,8 @@ DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a448
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.zip 7343 BLAKE2B 436bd84adabac44091873102b8c5161098a67f8799166cb6e11dd82a5e0781a8c138df286d73feee9998ff46853d0c37a6ed28ea14b88de0e42f57704a17cec3 SHA512 6b8fe83e5833685d0b274bd97212d05f936f4637eb3251b9d4babaaae4c60c420ebb8fb206b973e2a56eea470e1c4709439516e7e2afc23d2cadb1fcbc441030
+DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
+DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip 7889 BLAKE2B ae1c4350d7fcb3689f248bc1368387737195df522bf005f0932b4fc9dd1c952f8bb4850cb2506f4ec9613443132fcf0feb56e76fe4349c3ea2157331311ce052 SHA512 4f4fc9e8d7e040c00e0b5d670f552002b139df27c38f53e2dbd2b6ef9779e7be2f119995ffa50a62e096be1249a6be1fcf77c318ed44468d08eec2e1e15f64af
 DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod 37 BLAKE2B 6679d72e6167e53e5fab71f0359b872603f59f3847be944ac7350fa68c9c6fbf600187d168b666cb491f45ee9b07bb670026e4e19a8ff80da85417240dc004ce SHA512 9b33a2f10bdf31fdda6799d21d19ab5b0d4b6f7945d06fc56b73c8a73eaf7b3bb786a8992b0b5a98b178ce5993dc3ec6fa87f4a02c65dea2222a1675cae518b2
 DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip 6553 BLAKE2B 71b7387607bb853984ef72c2d381c5f830dccc2df5795a228a53abe5b4534338e5a09da0a402eada76c827d6161c73b9c514286609fb08542a3ce20aabd28db2 SHA512 5d3f18907b48533c9d8478ecf151e8e7eb34994e817ab8fe9ad2a216fc655e5a830ced5715fb5576caf5ecb6ec0b5ff4e80b31aaebb9f6ae6a5001f2bab717ea
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
@@ -108,6 +116,8 @@ DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%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
@@ -115,9 +125,15 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip 114575 BLAKE2B d88986713d8ab659873b157b8883b074a3e1ded22d588f347f9dff7f6acc351d61a788bfe73c0ae52181b460a8b046953c8cca804bfc616c025603361d43ff63 SHA512 5593f0a31642e1cb8abdafeba356abacc985129df2d18f6470dc90d7cd16806f67780f352bfcef2dfc5ffb95bb35d4a03ba4531c9f1f8bf4e9f9b4059d9bbe05
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.12.1.mod 415 BLAKE2B 4cdd79b12b6f47226dd1e603a12c94371a41a8b44734e01dc4be8249b508b13db9c75a31b73b1dff2fea28ea87f6b53f2fa7d6f7d26d657225c09bc1b503bba3 SHA512 abc74ff0b7af684d58a6776c9a2a0969ae0d48853362d8243b62aa7c478fa6e271f139610ffb59d21bed2d597627d58e1acdef1d05a7754a2fb0b4d596afdcbb
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.12.1.zip 527140 BLAKE2B 848779dae006f011714afd406b6586d9e17379e288daaf3c2f5cf6945325aefcdfb8cac8527984880a37fcf669722043c777407d2215f3a81e9f89d592c7634a SHA512 b56a1f7809a3df65733f4b9d2d27d0673b7eb2ad8fb477aa2076ec620f545181799d5547cb3d08fa62817b075c4c8f9c9cda28c34d5f57c7b3e49fd99544dd80
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.14.4.mod 586 BLAKE2B 15400118959bfd9012789d4cfc2766ae11790be2aa6ad55f0027d4828193bc427bfca9c3d6ee5f7ef26575aa6d97b63eb56003181ba81358b39e98ae48ce128f SHA512 64e77a7c061aae23705dd5ddb143fcb0a5da299787d32e2c6faafe4008cfad0d0b969aff9f2b1948e46f43061740dd4ccb0bb6a621ca635c701caaa65bb3fbb0
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.14.4.zip 607747 BLAKE2B 2f1679194f89c81de8d7cdfc72b93506fb806bd5429e4202ec4716a5d1ff7916ad809dbf87ba3275ca62ebe102d15fdbac242d7095b98411c33e8fb83296465c SHA512 d41f79d72e32cd6c7d6fa2a7c85fb02a351616d30fd4657a9f02a584da8c22667865344d060c1b7efcf7b72e3326849633b0434c1fbcb1691cdc735174abe518
+DIST github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.mod 42 BLAKE2B 1b36ffdf3a83189aff49e1d1353cd73badae858280e83cedf293d167cb71d5edb0c61ed6eb0d823251a0428c64073f82a5532682e80dcbfc48399556ee646cbc SHA512 17325059f7cf8236e6412e41da4e9b3237bdcbaff896a005d7be0f1fb9e5393b2b05128c9eecd8eb0c84db956efed1a0c9cfa57f10187ae8cf11c39b4f6852da
+DIST github.com%2Fmarten-seemann%2Fchacha20%2F@v%2Fv0.2.0.zip 61284 BLAKE2B c37a2108c815bccc27731b3a606dd03c555a9a30f85deb5ba0e1af6ab01e6ae13191b6cc591f4d2ddfe7b5886c4762bded2c319f7c46c68dc6416d1c10a0026f SHA512 cb4d2647779f381a44000b4300866c64769e19a2f52c02c00aa44c634bcdb8c8f40f2f6d4eab9353376f56dc80ae77e368b484920a622d19aafb2b9b533db87e
 DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod 176 BLAKE2B f13ab7cbc5159bcb8e425bafffb50590b8ba21d0cf304bf690151d42db2facda3347d7ac3adf8030cc939c4f1930945f97df443ac59483d1575db01e2d354163 SHA512 f3d70545df7302538e468344498b131d8d5cda99696d02e025f255b77ed02cbb87941eab7c17235ce1027dbcea96d298fc304d2ce88db1bd34aa9d1fb4487bbe
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.3.2.mod 169 BLAKE2B 2c00778603b181f9f14744bed2bbe1927e8f51a3ecbb49d7bbcf7b51fd5ad32756188708203e4319b9797c45a2488602ded332e56916b2b2d91bbb75d57920cb SHA512 f09ad6d4d7b4e53f69ad31b50c934a3534f68887c1b345a41bbb356579f217c2fdb482dd305214452e201b924e5d775a81ab3e91de120fee3119616a31a59da5
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.3.2.zip 573592 BLAKE2B 1e16b92086e76e9ad55e4d900e6f431b7f6466d8da0ec516513cf91181f8aedef7a204d537709a95d57374b4ca4763394833483509dae1a26efba998f8127d1c SHA512 206f6609015a813642a32d73e36a8e2ed13079f416e8b281db0e0a1aa99bac2b62631cffff070a1cb2ffd27203354436fa274d31d60cfb6a1909b8bf692f9451
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.4.1.mod 169 BLAKE2B 66f3337f2de4c5aff609c982426810bbe1f0922a5b500dc5a535a4aa7ed85b1559b165a49ec9dfbaed171293ba362d19610b5e4f0378dbe6c100d63661c01db4 SHA512 40b88a63b30373b98630a0cca582052b46f6620efeaaa90b2df49ecdbcb59bf8219e9da4a5b1e7d3f5b841a9503ba878c057247818f48524b070b49c63bb1bd7
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.4.1.zip 573072 BLAKE2B 6cfce7a4ac14a52a94c425306fa8316e202ed8bf0b3c366a1b0cf13d6fefe6f3a091607f2be6e893c144010cabe04dd4bb43c28c49ab5c213e7e837b6ef0999f SHA512 377054c9288dd8ff005cbd3e4a24f6955b81cc304f9901c8229f2b172ed6e117728787a39d039196c0a81e27b0d21a9b07853aec006fc997ee4c38dafed3f70d
 DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.mod 189 BLAKE2B 3c34af8e95170301452977d89f023bada8c3e270f12b50fe3e45e7cf1865c2c70dd36ffdaaeae108c3f37b6b9eb4f3808271c15e5142d3776f8b267c776451ec SHA512 cb02aff2c4be380bcdc26e15f10ac2a0f525939d5d10ca55de4d617a09bb9db77a9bd4e302debfeaed8229bec66d8e5d32a0890088c7b75d826a27af4113a8c0
 DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.zip 70016 BLAKE2B 3069b8fad8b3e2798f92481566cddc02353b13adf04e992a1d5fb0ffb27befc4e472425d5a86eaf16c560a2c19d950dcfa696f7b03709a45c5f318c0f632167c SHA512 b5c781e3cac14f21774af07457dc53f6dd9524c731baffea0edd0f341f16a917129c59cf25362ccefef51921c9fb800aeaf4db392edd5fec2573c15a19de195f
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
@@ -211,6 +227,8 @@ DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d
 DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20190923125748-758128399b1d.zip 207390 BLAKE2B 823b7fc76663066d99b5064ba0a0f2afc14c442e9a45522adb532affcd156433d6cb832c0978f3c92d842baf5eca3a20d30afb335b3c18e089698d8e323f49fd SHA512 41a84fa0c7f6b5ffca3996c28712d5464e5ec74c937b812b3748a4b705cca95195d0e7c18f69d305282d35a3f043440560ad03d0c66b2e23a4b431d6fd500c33
 DIST github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.mod 33 BLAKE2B e49346f4977274d91a2f0b337db451cb5425f38b9cc538ab151c740288135280567d3f555178d40cbd46aa76d540738760ac7024779d53eb8f6d86e54953f84e SHA512 fbae9fdf9f37174ba25808abd1b3ae1dea8ab81216464187e48868cd1457c694b292494c24f2e92054f54ce4c7ede37f0542d12df9db7ca0e46190197348c373
 DIST github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.zip 22167 BLAKE2B ac220a5ea44260b9725c89748e054b03d2b3488dc8d2d21e6513a13d22270e4937780089b6b7ed925d15641906c6aa5727474f45e5432ae58aab86e60387b23c SHA512 5728843c29d833360dd4eb07837180c08f4ac9e0f65d7a1f3a3854ada0a3902da3c05ea1a2309e783b536257dd4f937b9cc3f556e8426401a10d2f1619f5cf87
+DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7
+DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.3.zip 18380 BLAKE2B 3d89274008ba057e502f9d2cfada1c08cc4cf89b807feb5f2b3ab43a942f1260589ca4e166784fd72ed693ac44a0a87f2aabd5369b3bb22efa4758cbb127500e SHA512 13d7083668aba9379b82fe37230a107a618a125ae16ed89481632546061d9e5f3919d94f4a03b29c1af925f12fb770a63a534102a5eb72018b52bc2f54af568e
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
@@ -227,6 +245,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190829043050-9756ffdc2472.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190829043050-9756ffdc2472.zip 1826014 BLAKE2B 90f25bb9c535b6f06017249c575c24d9760afbd258f30f65916d4a6a83e2563c8852fe7c746f4d8fd303c9d76f128a45059056a65fb1b760407bbe95bd7062ed SHA512 e7c3d811ec87ba2618d5cc24e9877787a0739e7a7981dfcc4a66dbd35b8f2a933fb54a30ebda4f47bc0757d6a0cc26c4975d0f5736849c73d4a4c8a4851ec17f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip 1870169 BLAKE2B d77b65d467395373431c09d1318cd73d2dded32c6c7bbcaee6e59aaeed4b8ce1c183e32747f8da207762d82aa07c186af4b9c06dca9d4b5cfcaeef3bd07b3e16 SHA512 abd93a766353b4c36ff9527df785cf9789317755de2fd1d951a1847c4a9b43de197f6d7cb41ec6f17fd3b50617cfbf8e1d8c93f59f671be578a0152da0754ff3
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -252,6 +272,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.zip 1590803 BLAKE2B 03ba05da7a119422fd9463fa2022e0623ec370dbd21fe63525203f18f8daf2e5c6b2c8cc9ad5ce9e4ec938184ce633b0b2764fcf06d65e2550b82989a4d08552 SHA512 77809949c5156b79b74216eb938dc5129128d403fd6f84aff988de7529e2fed6219c7afeb70ef569b1de13447fe1edd68523fff8253759fddcaf1c04ed8b623a
 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-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip 1866142 BLAKE2B eecef3b6640818edf21f8bc62cd44ec7c3d6959165cb85e9bb1132450100de82c43c0337db78d100e0ff9b886f51427bed3f3987176cbf07ce38903bc96fefbc SHA512 fd3cdf5bd56617de83a09132656ca226c4334447f68494282fa7101ba2d85ee02a33d5fe870ad46e59e5fce4bf7bc031e0f1012315b6d017203e3915ac06a87b
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -287,6 +308,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST syncthing-1.3.4.tar.gz 4785353 BLAKE2B 01ea21d207fd8d84d28b03125f6c3b2071a458b7e2fd611d31ae3b24e0eb38e9b28afed7b2b15272a362394e3b6d77e3385e74b97afe021915211cc394422b5b SHA512 1584e0856a7c559d4e809b171c6c7aa0cd01ca94a513607bc3ce6543a82ecb454647c990dfed221cf9d3d566b6c5b522f3fc3549aefbb0487111ecf54366f8b8
 DIST syncthing-1.4.2.tar.gz 4792506 BLAKE2B 32f5944b54f994e827226c4704e1c6a66e39124a7f72f5b3864b5a204d59b7c89c65df1fa1715096fa8af3a397fb4e7d695720faab639747018909c437c555aa SHA512 39631ce3da7e77edff92809cc0dc4224b7311da791b8a60aaaf06d60a476d2e9d6b914d4f4b9c13d33dad19cec98093c6cacc75abe431bb3809b5b5fdc883591
+DIST syncthing-1.5.0.tar.gz 4797347 BLAKE2B 60ccb06d491b2f7cb822207cf55f70fe79cac044900b3cc2947132a5e410b3be5b7a4379472c9bac77f10f7b3a599617644ee573648c7e84abbb456511f493f4 SHA512 a1f71701eb1f615b8783a75ae21dbe73b26c5371f7225064c5ac2cf71a227a1e679420ec68ad7f95e51e0962d810c9ecf8a977fef8517de8ac71a9d7b8f7022f
 EBUILD syncthing-1.3.4-r1.ebuild 16157 BLAKE2B 41eedeac4255ac0559a8ebd1545abce9c1f94547b742b6dd644377f9e2ba1e288cce6fc10faf8e8b5d2fb5f046461ee50d03d80eb66e805324f6fa5a80a13d21 SHA512 595ce2e21d5afaea290697c6757f24e8b18805914aae9221e4b55a05ab2e562bc49e747caa1af236c22cd71ee3bcc23afc6c445302d5e9194303f6d61d1c346b
 EBUILD syncthing-1.4.2.ebuild 16850 BLAKE2B 2172f321051205b1f8a5f9b2a5aa74f8cfc536e8d7ae1fc85be87e1e43c16628aafa50227a697cb7d0c0c4e4d3f49607c2bd8910cec2aa2cd596f11965bf0381 SHA512 f22c4511a07aaffb2a7002c4917cd9b28cb772350ae11772e8f8d80572a2df99ab12968e1562ab6293fe93a98546de7043d849e5effcb2ec8a23c27c35f4d328
+EBUILD syncthing-1.5.0.ebuild 16606 BLAKE2B 33e3eb982a4dd8b4c4e684751583bafffa696fb12932b296f6266b3914fcc39ba8289ab30de76c227668ff3e7d5092618b978f6e35f4213c8f4ee1065477f6ce SHA512 2fed1577d0de26d11e95c0e18579360ecf3074b15cbcf8b924079940589b3e0225341fe23bad8f918f518ce9329a4a3e1c01f90f450d5021df3f5192f5f58564
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.5.0.ebuild b/net-p2p/syncthing/syncthing-1.5.0.ebuild
new file mode 100644
index 000000000000..d4a9fc74661c
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.5.0.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd xdg-utils
+
+EGO_SUM=(
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6/go.mod"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75"
+	"github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
+	"github.com/calmh/murmur3 v1.1.1-0.20200226160057-74e9af8f47ac"
+	"github.com/calmh/murmur3 v1.1.1-0.20200226160057-74e9af8f47ac/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.0"
+	"github.com/cespare/xxhash/v2 v2.1.0/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/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/d4l3k/messagediff v1.2.1"
+	"github.com/d4l3k/messagediff v1.2.1/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/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.7"
+	"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/jackpal/gateway v1.0.6"
+	"github.com/jackpal/gateway v1.0.6/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/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/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.14.4"
+	"github.com/lucas-clemente/quic-go v0.14.4/go.mod"
+	"github.com/marten-seemann/chacha20 v0.2.0"
+	"github.com/marten-seemann/chacha20 v0.2.0/go.mod"
+	"github.com/marten-seemann/qpack v0.1.0/go.mod"
+	"github.com/marten-seemann/qtls v0.4.1"
+	"github.com/marten-seemann/qtls v0.4.1/go.mod"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/maruel/panicparse v1.3.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.7"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.4.3"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/geoip2-golang v1.4.0/go.mod"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/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_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_golang v1.2.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf"
+	"github.com/shirou/gopsutil v0.0.0-20190714054239-47ef3260b6bf/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/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.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d"
+	"github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod"
+	"github.com/thejerf/suture v3.0.2+incompatible"
+	"github.com/thejerf/suture v3.0.2+incompatible/go.mod"
+	"github.com/twmb/murmur3 v1.1.3"
+	"github.com/twmb/murmur3 v1.1.3/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/willf/bitset v1.1.10"
+	"github.com/willf/bitset v1.1.10/go.mod"
+	"github.com/willf/bloom v2.0.3+incompatible"
+	"github.com/willf/bloom v2.0.3+incompatible/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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-20190829043050-9756ffdc2472"
+	"golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
+	"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/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223"
+	"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-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/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-20191224085550-c709ea063b76"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/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-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# As of 1.4.2, stupgrades still fails to compile. This command was not present
+	# in releases older than 1.3.0, is not compiled in by default (USE=tools
+	# must be set) an in any case we do not really need this, therefore just
+	# get rid of the offending code until upstream has fixed it.
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0407d0a2716d..60b48c2dce4e 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index f8d072ac5fbc..779b2dc37940 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,11 +1,14 @@
 AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
 AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657
+AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e
 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
 DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859
 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186
 DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db6554252997242dcc98ee65fe856528848843cdd6d2195e3839d8dad71f1fc722cfbb2e65730020665d9095d0a93900840659477d SHA512 3d9afe4ca6b042015898f4fc08d991a4af2c55010c9d98807a12dade01d2655f74b7e4896abeb933c93faeca954bcfdadfd6e359ee8efe5952623fc635500729
+DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21
 EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
 EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63
 EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
+EBUILD cnijfilter2-5.80.ebuild 1770 BLAKE2B c496c271e33c95c2af7c5d8ee5277defa10156d7e890665967f703ec449c24cf9b2896dfa2f3fda072f819195dcd3fe41b616486d9f55d24589394d3a8bc8aea SHA512 62ff4e92043814160283ea3112f9ed5d4a8ce6618486c318e6a24a4961c1992fce6052583acbc6e75a48020ffc97de48c6d772194eae4788fb895ae4fd2c88b8
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
new file mode 100644
index 000000000000..4efba8cd2e1c
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-source-${PV}-1"
+
+DESCRIPTION="IJ Printer Driver"
+HOMEPAGE="https://www.canon.it/"
+SRC_URI="http://gdlp01.c-wss.com/gds/3/0100010273/01/${MY_P}.tar.gz"
+
+LICENSE="Canon-IJ"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+	dev-libs/libxml2
+	net-print/cups"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED=(
+	/usr/lib64/libcnbpnet30.so.1.0.0
+	/usr/lib64/libcnbpcnclapicom2.so.5.0.0
+	/usr/lib64/libcnnet2.so.1.2.4
+	/usr/lib64/libcnbpnet20.so.1.0.0
+	/usr/bin/cnijlgmon3
+)
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.70-gentoo.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_prepare() {
+	default
+	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+	LIBDIR=com/libs_bin$(usex amd64 64 32)
+	for d in ${DIRS}; do
+		mv "${d}"/configure.{in,ac} || die
+	done
+	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
+	echo "AM_INIT_AUTOMAKE" >> configure.ac
+	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
+	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
+	echo "AC_OUTPUT()" >> configure.ac
+	echo "SUBDIRS= ${DIRS}" >> Makefile.am
+	sed -i \
+		-e "/^CFLAGS/d" \
+		*/configure.ac \
+		cnijbe2/src/Makefile.am || die
+	eautoreconf
+	cd ${LIBDIR}
+	rm libcn*.so || die
+	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
+	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
+	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
+	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
+
+	cd -
+}
+
+src_configure() {
+	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+}
+
+src_install() {
+	default
+	insinto /usr/share/ppd/cupsfilters
+	doins ppd/*ppd
+	dolib.so ${LIBDIR}/*
+}
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch
new file mode 100644
index 000000000000..e76176e003b1
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch
@@ -0,0 +1,10 @@
+--- a/lgmon3/src/Makefile.am	2020-05-13 23:18:47.936735159 +0200
++++ b/lgmon3/src/Makefile.am	2020-05-13 23:19:12.239525072 +0200
+@@ -6,6 +6,6 @@
+ 
+ cnijlgmon3_SOURCES = cnijcomif.c cnijifusb.c cnijlgmon3.c cnijifnet.c keytext.c cnijifnet2.c cnijutil.c
+ 
+-CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@
++AM_CPPFLAGS = -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@
+ 
+ cnijlgmon3_LDADD = -ldl -lusb-1.0 -lcnnet2 -lxml2 -lcnbpcnclapicom2 -lcnbpnet30
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d1ed24c3bd2d..723ad69d2316 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index eeacd0a52ffb..97004e3bdbc0 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,4 +1,4 @@
 AUX ocserv 182 BLAKE2B b7ea6c381fed7406bda8fae3638445d6cd2e2acaf5f5c310227fc56f62e3286df6bb49063db8d2ab8dce2c6d5e8487b50085875f2af057b662aeb37b5adfe77a SHA512 9e0dcc3668e5e7584b4f01f56c0b48c7a1099b3658ee2387cd899050030328c497e64f9409a1af589ab42f8b6b1e7f13828a50b478906721ccad9d3013f3b06a
 DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b SHA512 953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880
-EBUILD ocserv-1.0.1.ebuild 1746 BLAKE2B ad469392d07f290272849f0c5d47c0f47407fc0447630d8dbdee381db2b182a592baa2343bd0342bd018ab1493a872f02815efcf4769b627ab80f511ab0f629e SHA512 cb8a5c077e27e4b1ea3477509cf64f545cea41a5504e3197aac6f53dcb3a029900aba205bd2dd5e1f732b983ceb47e337077ad25f9c6d7ac54dec8d1e22da076
+EBUILD ocserv-1.0.1.ebuild 1745 BLAKE2B dafca01486f319743b7cd176910baa090d1fcede5c4ab84ae125a3ecdd10eb78f1792ce6d2a9c77b482126d04a5bec1aa10b4eed69588c5240198595d02069fe SHA512 ba48a71e1b79d6b37d698122af5d41b1c825793d38470e3a80987049c0f79d70f6a22dd68a0aa742b5a6bf0ed378c5365ad8ef75d52164ae8ab2887e3d190449
 MISC metadata.xml 325 BLAKE2B 1bb6068aff761fbf40d489d5d60bcbf295a079a2fffbb99af64abfcecaedf7cb5407b3f94b6823b58690912f43dc4427cd8d7a658d2f809b45462702ba5f0aeb SHA512 4fb35360034ac9639198ebd1e0917848b807e0a53ec10eb2d4e1a90a4f3f631b582e6f3d6e3a7d50f2f284ff47dc1a2ec4d362fa73f6b5a1834ef531bb2bc5ca
diff --git a/net-vpn/ocserv/ocserv-1.0.1.ebuild b/net-vpn/ocserv/ocserv-1.0.1.ebuild
index 19106a233893..90aa175c0d33 100644
--- a/net-vpn/ocserv/ocserv-1.0.1.ebuild
+++ b/net-vpn/ocserv/ocserv-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index c03b54e9a7a7..eb6417cd98ea 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -9,6 +9,6 @@ DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fd
 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
 EBUILD openconnect-8.06.ebuild 2902 BLAKE2B e35780d945d40094ab41e08aa27f026432561734b16bb705f5472e7c8ed20e26e3adfb4c7326aceb8b57244cb7a7c7a34f908e225bdab20b4d6596c921016bd5 SHA512 06960353039c6ae6827c4f661ea32848395ba12dcea7c3067a33ef9a492cfc639a8724cf2282b45a79c0040ac25098998239f5efd41b4d0edb384b90798b37ab
 EBUILD openconnect-8.08.ebuild 3000 BLAKE2B a5b19466dc4a8f5cfb00520520c9d82044da2bf41011689d73bdc0d08b0665cc475362449ff4408537116ff3de2440163db899404f478e53706b839a357042d3 SHA512 7687a960a30a0438ba5d86e615224900b1095ed289a6349f429d77e9b86ac41bc557360270b73ac2fce0f7106031066eece093cc269250233d82016d46bf0cc6
-EBUILD openconnect-8.09-r1.ebuild 3089 BLAKE2B 8467127dcfed473dbfad66a8ac013353db30a80c89915fc3b111fd842aeebf3cdd01102c57e7fcad41a14d10227e2a2d104cea41774c61c3f59f109105b87531 SHA512 db7f2f027fc6b358ec88352a9a3da6901dd357b98d0e0bb2a4cef85f0023f042857e5940e7765abd5e1d2a973b81adfaaa3ccd3012e55425b2ca34bc32bed24f
+EBUILD openconnect-8.09-r1.ebuild 3088 BLAKE2B 0fa56a34165071b773577c25ebbbb017b7bc2750ba71e764f62f1f1ece7201dc70164d309d571159542b301794fdf6be801b0ff9c9f9b990f875ba690ebe72ce SHA512 e741fb2a611dadd9e767bc6bf27e532b65f24bd4f405f8733fb143b5424632658d3f56d0fbe500e15f1d6ef0f82a00b1c4859f9ec208eaa78ed88a76f4641fba
 EBUILD openconnect-9999.ebuild 3005 BLAKE2B 8c279c574aa355a0c5325d145031623d2dcd11476a9be3f6d30a862b4fa9ee7f4e9faf03332dd2a51345c9f4287f7cc1e0936572005aabbb05fe3e0c497e1db3 SHA512 98734450f88bbeb0b292895ef4b43bcc0d1044df4aa8f02c0f3f09b3c436fbb10401070d3422ab43b474d59fc779aa07c13caecf268679a1845d44f593ed5c92
 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild
index 26838ebbd2c6..efc77c0bbcd9 100644
--- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index 014dfb548f48..00faa08fef0a 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -1,14 +1,9 @@
 AUX tailscale.tmpfiles 79 BLAKE2B 8391d38d1ba704d356f894040cf998c42397e567970d285cf0ef82a854b48d534446231597e4e50ef913c03d8540488eb81ef296c8dbd0dc2c61ebd9678ad708 SHA512 9c220d99fae73ef3b8d76d35e137b48254719836087d75859027ae087190e57eaa1de21379efde05cdf285fe4cbd767e2ba9d7280b699695294150d351598c88
 AUX tailscaled.confd 147 BLAKE2B abea10fa6d05304a0c953dfd0fa1a4c10054129294d8554846d961457164513a52c551cea2603daffb4cbaeea9c22332dbb32c251dab334e095253ad474206d3 SHA512 db2e0727b84aba6d473a65cee1029fff0058754f1474c1062f37215da51ea85942b5ab3aabfb3f904d47aa5ec5844cab2c7126313dcdca35f10144a7525dd916
 AUX tailscaled.initd 416 BLAKE2B b4196852147dad2bf9a948b3d36f2d3b02e18266174d0a1f3b252ceca71132d232fa1de63a1b03992ccb39dcbdbb29b69791bf51e2e130c7192271114887c1e5 SHA512 a65a386715cfd21a02723ec6c7d05f874e0ac370142867c8145a7f9701cce0eacc2861aed69041363ca6e01fa5f87941464c653822ae187f1ea5ab66a1587bd2
-DIST tailscale_0.97-45_386.tgz 11879684 BLAKE2B 690e707e499e6986bd9676875af818f9fc68a7b9a4f66b2384efab4efa0c0d95cabe1a4c816152a7e61d14f33b16f1da00a8e7f9c26950412c2ac971a0ba090b SHA512 c81ae265c20bc2f8e9528b78dd39fd53d74b7a90d354617673912632d6599c9c0b866156ff8032b6a92f8452ae95789fdd0be3db87cf13aca2bb6ecdb13edf28
-DIST tailscale_0.97-45_amd64.tgz 12233156 BLAKE2B 120781c003be7cd244dd8b3659e817aea6567d0c0d4e34f468f2fb584b62a34cadec4e37b5d96076e7b4c9ffc6611b4dd7d41375ce6e54812e89d974af70a558 SHA512 6ed0dc7d847c75b3597deff0febb5a72b07d027e8b4889151c00126d77dd1dc3fd878080a2d0d4737a3b9a5f3b11993e2ff6991fc7e5fde2eed7838239515338
-DIST tailscale_0.97-45_arm.tgz 11328113 BLAKE2B 1ca588dfd8bb2c6e2b79d323b39f919ad2aebbb4c1812330a2875752b102bc461a304fa9c9761bd090d6361a966e04a06128535885383cb5baca0a679013e5b4 SHA512 78d8f44a07365ebc226df9c0a808f8da2a3e1f102db7aae3c9612c5c7e6ed5a32fcf0d43b43f23c507bba7ca4049be7a33c52473cff53d3fd7e9f9ae6b4d84bb
-DIST tailscale_0.97-45_arm64.tgz 11321460 BLAKE2B bdaadbb8c384cab4d098b9aabab299767744bc0ada5b31f7510505e5dd83b507b369010ba4d9e96935fbe8cdd9fafe3fd9308d3ccd5aaf829c3aa85887bc144e SHA512 e6a68fe36219024fa01ce0bc5b2ab56614197dade1cdc131ef8f966684fa513e0e51589fc4e7740812f08f05a2b08127a8679de3005b925a613a1bef8675a48f
 DIST tailscale_0.98-0_386.tgz 11772623 BLAKE2B 085f798bb1aabc8f6e286184428cca84cc552037bb67b503227e7c56acc90b6b9b860d3147498bbdeb5dc39164d472ba4ea441b93a57dd37b5aa4a977f2f1702 SHA512 10bbdbc7da71e018189eb63fe126237bd978cad8169a824f8bf70c065e53bd3d0f2741ce0bf7f810f27f68a273d33caf4cd086acde51956109c0d5317862352e
 DIST tailscale_0.98-0_amd64.tgz 12080659 BLAKE2B f3935a51c0210930d93c1779022e0e11508a92899fab5ba50c2a14a8670bc03a601de18847c02428971188647b60ba0154b12027c5d4224d47735964fa031ef7 SHA512 119ffa7a7035327b388dbabc118b37cc4af5f0b2bc01a4a757719b37659fefc2363eb48ef68c8009a05bff3cf3caf92a5f918683f49cdb052fc6c618ad08ed45
 DIST tailscale_0.98-0_arm.tgz 11276678 BLAKE2B 06e176c8fcd68761b8c3a9399e189b7793d2284315187b77c5c36309d6e5d8ce3a4675531315a47cba54fb402b0f07e02bcf2f9cd4c502f99131d86a1b0e422b SHA512 95913a397d636188d9673d1eca37e3b4fcf87ade0fcf7b69d086b2d05e5d854aba786ace03a1b7f406d02140a0c9197c925a5666c8a3bc1d11e15479f6440deb
 DIST tailscale_0.98-0_arm64.tgz 11288963 BLAKE2B 4244bcb6ff79dfaece4c82917a39804b6d58ce6a5f0572d19f62d9ba4cd40a0031eb723aee5a12dedc1303fbb8e9926d1b6eb9964080c5f162149dd049f8322b SHA512 b81c90a5a4a999a03c7edeaf65a0a2900771ade17a888ee03c29762c491d9fce605ce77f812949cbc36ad113d8a5ce5d2e21d69e91a7b4b8a87a8fc93129aaf4
-EBUILD tailscale-0.97_p45.ebuild 1148 BLAKE2B 51bdffb3879948dbfa6874f15885d6471bf0f971a3872bf789d49df150458eeacd94b43578f78adb625ee060a1dbf47008fde1229ac90b2f70081e0c6ec3dce1 SHA512 f03e1f52a4cc8893603e9603f38d51bf03a31aa76076c0d521d0cc3e59dc636b2457222343851402283a3dc40ce2417ebc31a799df95f58da3bf11711eba60b1
-EBUILD tailscale-0.98_p0.ebuild 1144 BLAKE2B ab6207222e23e25b2b8a06f228da56d225745326f5435d663b63b02d7fe075988b71b90edff207b857d2997dcd486941f2897472f5372f4c4492d0ae05b40152 SHA512 fd64e1e33fcc11e7b1653f1811368b243fa4eb113e11e281df13118013a39d17380872809611cf75459a7fa08d4e336f628009781d6e07d2bfd1a696fcf1aeb9
+EBUILD tailscale-0.98_p0.ebuild 1149 BLAKE2B 1521c4a30ee1380cb3b0317a0a23d0002a6a6f5ebf9bcc11e719e223d5eb908e4d50dbce367e9a0cac36688e7a83b5f94250c2c5395cac9df8c3a56f7b8db79a SHA512 bfe31ac24857f4840c4c2549256a9ea9567f979f217a4f9c7ce6bedb2e2e30f588074540eacf0ca2b14845eddbca67fabfdd48c8ffa7fe2d7b12ac7736f91f5c
 MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/net-vpn/tailscale/tailscale-0.97_p45.ebuild b/net-vpn/tailscale/tailscale-0.97_p45.ebuild
deleted file mode 100644
index 42558405f114..000000000000
--- a/net-vpn/tailscale/tailscale-0.97_p45.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Tailscale vpn client"
-HOMEPAGE="https://tailscale.com"
-
-MY_PV="${PV//_p/-}"
-MY_P="${PN}_${MY_PV}"
-SRC_URI="
-	amd64? ( https://pkgs.tailscale.com/stable/${MY_P}_amd64.tgz )
-	arm? ( https://pkgs.tailscale.com/stable/${MY_P}_arm.tgz )
-	arm64? ( https://pkgs.tailscale.com/stable/${MY_P}_arm64.tgz )
-	x86? ( https://pkgs.tailscale.com/stable/${MY_P}_386.tgz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="net-firewall/iptables"
-
-QA_PRECOMPILED="**"
-
-src_unpack() {
-	default
-	use amd64 && S="${WORKDIR}/${MY_P}_amd64"
-	use arm && S="${WORKDIR}/${MY_P}_arm"
-	use arm64 && S="${WORKDIR}/${MY_P}_arm64"
-	use x86 && S="${WORKDIR}/${MY_P}_386"
-}
-
-src_install() {
-	dosbin ${PN}d
-	dobin ${PN}
-
-	systemd_dounit systemd/*.service
-	insinto /etc/default
-	newins systemd/tailscaled.defaults ${PN}
-	keepdir /var/lib/${PN}
-	fperms 0750 /var/lib/${PN}
-
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
-}
diff --git a/net-vpn/tailscale/tailscale-0.98_p0.ebuild b/net-vpn/tailscale/tailscale-0.98_p0.ebuild
index 1a9d74fe71a7..4b6378a2c008 100644
--- a/net-vpn/tailscale/tailscale-0.98_p0.ebuild
+++ b/net-vpn/tailscale/tailscale-0.98_p0.ebuild
@@ -39,7 +39,7 @@ src_install() {
 
 	systemd_dounit systemd/*.service
 	insinto /etc/default
-	newins systemd/tailscaled.defaults ${PN}
+	newins systemd/tailscaled.defaults tailscaled
 	keepdir /var/lib/${PN}
 	fperms 0750 /var/lib/${PN}
 
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index eb52e0fa42e2..a10f93aefc19 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,5 +1,5 @@
 DIST wireguard-tools-1.0.20200319.tar.xz 92324 BLAKE2B 9f514748708ef6a5b7f5b043c9054c954d17bb77de7a354b5a9a4e63cfb5f441237e98b16b288426441a7e709e1874d396cf67b04b38bb0ebbe7822bb32ada57 SHA512 d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41
-DIST wireguard-tools-1.0.20200510.tar.xz 94560 BLAKE2B f84b824ee63dec615a4d7e50b03e03db7c8c9ecfdf16541518a7d39e0a16d1f30e7e14eb8dae9a8011e24a13dc6306e7d473073e22c649debb77400bb4b25d5c SHA512 68a75340ebf5e28bcd751815a41f00c400ad891b483aab4a10af9de604adfde0157578f2c2724171e2a59e825c8369e81d0a0cf7a0111ba429319704c482526a
+DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
 EBUILD wireguard-tools-1.0.20200319.ebuild 3227 BLAKE2B 28d1a50c5379f54153138c0cca1681cc2ef9c34833ccbb465b15b2cdf4e288235fc1a3beede3059d5c040ccbe1289be7a0c7250491b8fb714db5f158c129fcc1 SHA512 e1afcba37c0270e4e121fe26346314818e51b8fa8a627ec39c69e3014fbd1ea7cc7c44f47a4925ef3086ec60a2fd11b532f8af9102db825856ab34545770ffd2
-EBUILD wireguard-tools-1.0.20200510.ebuild 3234 BLAKE2B 0dcfc0ad5c8f7e893fc8fa7989da618b31025f2e7c28defd22278bf3f0228eb87014e8b32d6787ac257b94bb6ffdb2b2c34dadd06b0375d948a28685bb7698cd SHA512 f2a43c9a53144ef7a8fa7fb62a7fff5126f9422df3b946c54ec36c3637e846533df92e62dd2062ef2e405c44ee6440af5825f929d99779913bb55face199c383
+EBUILD wireguard-tools-1.0.20200513.ebuild 3234 BLAKE2B 0dcfc0ad5c8f7e893fc8fa7989da618b31025f2e7c28defd22278bf3f0228eb87014e8b32d6787ac257b94bb6ffdb2b2c34dadd06b0375d948a28685bb7698cd SHA512 f2a43c9a53144ef7a8fa7fb62a7fff5126f9422df3b946c54ec36c3637e846533df92e62dd2062ef2e405c44ee6440af5825f929d99779913bb55face199c383
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200510.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
similarity index 100%
rename from net-vpn/wireguard-tools/wireguard-tools-1.0.20200510.ebuild
rename to net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f9670e1b31ee..97f9f2174f85 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index d3761c66dc59..372164aa226b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -2,7 +2,6 @@ AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27e
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
-AUX kismet.initd-r2 495 BLAKE2B 6d495c1fe5582921a67acf411fc65f6f3b3d832017e9354e09a3b39b8af67193e519a9da838cd26e80e80a6e145cde879089adb56ea34810a2d42c588fac7d28 SHA512 4066adc3b5ae455fb1305f4d5ac71604e90b2e1e6210fef10036229f4917dbf40dd8853f8e9dc2accc1457e4fd95f28f13ba39b56e066df365d7d186b3ea25b6
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
diff --git a/net-wireless/kismet/files/kismet.initd-r2 b/net-wireless/kismet/files/kismet.initd-r2
deleted file mode 100644
index bc4374e68016..000000000000
--- a/net-wireless/kismet/files/kismet.initd-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting kismet"
-	start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
-		--background --make-pidfile --exec /usr/bin/kismet \
-    -1 /var/log/kismet.log -2 /var/log/kismet.log \
-		-- --no-ncurses ${KISMET_SERVER_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping kismet"
-	start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
-	eend ${?}
-}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 643edeee8227..6195a6a62d6d 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,16 +2,12 @@ AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f080
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-5.12.35.zip 114691419 BLAKE2B 0400f78cbc880f52e8e352a1b8ef925c293b5a51137aaba89c4e26f7b213661e2b9e5caf09cfc6af0f74456e1217f4e2b8f398c11ebe32b1b6a17153cef9e920 SHA512 4e6b3726e5b6e43c1688fbdefe816eedb1cefc671bc9f861cc06f1c4f52a903670e033c2c5b2c66c5ed2c3f42e8f573e6245fe483a32a0df33283d46ccb5d96a
-DIST unifi-5.12.66.zip 117434749 BLAKE2B 6d48632b7add5f3943574decb66aeb209c570151ee4f1c4dca10feeff924ba1946bc7bd1aae8ce36ac0a20ce2765da9953ded073086a82fd59ed08a57e30965d SHA512 138882bd7a67900ff47e5b02644a7e1941aef98d49ee6e56fa41b462ffd2e92e073e8064bfd846f2c369ef3491b3adc3032dd2ca9b8980058ca88d1925367ca0
 DIST unifi-5.12.72.zip 117402382 BLAKE2B a847982972aecfc344b3054ac8364270f8de38452e818a9a575266550292fbc9fe5554937191cdfb208002a412e3fd7956a85ae9edc12fed65461a95ee801915 SHA512 a3764d4a3b39a16bc08c3206a8ceb37614d9bbd356e2e56f18eb33cc42de5c9cf21ed2a99689d0e5b794356163a0159911916513eed154b6c8ad0aee9db0e01b
-DIST unifi-5.13.18.zip 150552474 BLAKE2B caec9f360b2db5d7e155ef29c7a6d5851a0c7de8a476a018b33a5423f0052fb46a55deadf74dba2d51763d4a675ea7b6ba2d9195087b9be7a9280ffe5c8b5c27 SHA512 deb08448d48a49be920f8e300117fe4326f8d1bb58117e5fbaddc6db268d514ebce85b605ec26248259e2be51b01605045c56e3f84bd7249bee25a08b4784535
 DIST unifi-5.13.22.zip 150546130 BLAKE2B db82f7b95fe3dbda2f19d1361cccd25670325babc61c3d55b4d4e716b0fd2a5cb22e0ac45367b0a5fa975fdef35bfa050bf951bac6c5ce83ae8cf9aa205d5026 SHA512 9a0f5c85d2b4fbdc1f518da95bc5554473cb30e71e1c774e31a82d1579f973667945a3338746288ca98b95c02f3e73450a96295203e62f0e33ae57a7c6ef5d39
+DIST unifi-5.13.26.zip 150661380 BLAKE2B 0b8fad507039f5055f1a8026218c5888ee7371e357532c0a5fd5f1d779c800d9e5c85e82b8a254dba270b23f49b0c9dd766fa4bc6630087bca146568135286e3 SHA512 8e886a8dd2a858c22eca35922d81e54e45285faed7fd5885ac57cad0b2a68af33547d0231fbb4cb78fdec732a6a9f11a2ff3856b78eeabcfb3aded5ec47b6e65
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.12.35.ebuild 1777 BLAKE2B 84159e527fa3a125543f3335bb8fb17ceac1634ce143ffc262a2caf5c6da27e452ce6adf999a205b187bad5623fdde25f97bd83f46dd93ee448fd83c84ed4f50 SHA512 a4324b8391a72d073fb67b629326683335bafa66c013483f689c95fdd59caf7e4c697f2ee74d63ea68075a7660dc5e4034f7569043cc80e147a0df3fa4717f87
-EBUILD unifi-5.12.66.ebuild 1789 BLAKE2B 512679ecfc4f0b438db8ff1f7049c4ec8da2d64ddc3e07c22997a96aacccac966452c972b37468e27249e777fe9963e8626034f4108c34d8588e5872480d15c0 SHA512 4b4c0cae00f63bb28a2bf0d800b9703b653ef7ca54c5fc224b8bb9daf5431ff59f50bcf7ed076f9aa73c6d552691122026d7ab616801c808141b9b25113869a2
-EBUILD unifi-5.12.72.ebuild 1789 BLAKE2B c23ff96cb68c881c35c6e83571dcadfe654c0c24e582c685cc4a2e77e6835baaa7838fbfeb647e0b8883613c780584bdca12667d9c4b7ca6114a6712d3dc4626 SHA512 22a2001966066a2d783d0b7db988045e1c4b63287c37b0ed72f442f8a235bcb270d8833db941498eb4bcef4faae24de15e2a0852834b7d124e94a06ae70c79e7
-EBUILD unifi-5.13.18.ebuild 1567 BLAKE2B 87a846f511bde38c1126e8d8ed242f6c9a6fea4b88a82f2b7ccdddf888bf14e9f2f0c8caa88130ec4003763243616ce4e59363af58e18e3d0ad1407e78e71e8f SHA512 63e0dbdc27bfd6e5e5ebb9cab20dbc444572be884cf97b50314aec04b5a79534c1e2118ab2f794500acbb239c2a0637071fdc9929017626274acc09e641728a9
+EBUILD unifi-5.12.72.ebuild 1778 BLAKE2B 78a37adbf6d5b509ff4ebedb4526cc31633df6e7f60265bb50553d2c9d0873354fd1ab728d87d9e11929b78b89ffc36605c7b45d654bad3c771350d97a81208b SHA512 6394293932ab616e67e7b2d2c30c8ce850c3c58196259969662332dc2782958ffecc17633691a28b6cf7bbaad56c72128c37945ab88971ffbd46d2964fd874a6
 EBUILD unifi-5.13.22.ebuild 1567 BLAKE2B f1495f8d2d7be3e62d6e74766518c0ced0bea6dab8ee8d1cb5700d51bd1dbb8cb8b54616c3560d23c214d701b97fb50880163ea11dfd4eded8505a803132bb03 SHA512 26075e5d4356f9f7bb2a92ced7d7aa138f78d995fb143bf1339fd102eb47cdccfb9118f7fa1e8a59b7b63c4e406b442a241637d1c992edaace5e9624ca7eaec3
+EBUILD unifi-5.13.26.ebuild 1567 BLAKE2B e060e715478870dc639e9e0bdd474cd8815fd8e80411d27d963070cc714b81e2015d0e449b7c03bc59e24ed46ed0ec88166015b61150c5a3379ff786138f8f0f SHA512 e82207092cd951f4b10310f0062d28de541fc1a66ca4cd86604c27a0a7d4aca2eafe34cd936592fa5951731a1d610591cc0f0f657b793eeb4bfcacc78b2a7849
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.12.35.ebuild b/net-wireless/unifi/unifi-5.12.35.ebuild
deleted file mode 100644
index 5d08ca989123..000000000000
--- a/net-wireless/unifi/unifi-5.12.35.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX=""
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.12"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.12.66.ebuild b/net-wireless/unifi/unifi-5.12.66.ebuild
deleted file mode 100644
index ab308221d387..000000000000
--- a/net-wireless/unifi/unifi-5.12.66.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-2a7dc90946"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.12"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.12.72.ebuild b/net-wireless/unifi/unifi-5.12.72.ebuild
index 338c9edad137..17ff873d18c1 100644
--- a/net-wireless/unifi/unifi-5.12.72.ebuild
+++ b/net-wireless/unifi/unifi-5.12.72.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-0bbca4291e"
+#RC_SUFFIX=""
 
 inherit systemd
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/5.12"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-5.13.18.ebuild b/net-wireless/unifi/unifi-5.13.26.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-5.13.18.ebuild
rename to net-wireless/unifi/unifi-5.13.26.ebuild
index a17d29e674b1..23cef5a1af70 100644
--- a/net-wireless/unifi/unifi-5.13.18.ebuild
+++ b/net-wireless/unifi/unifi-5.13.26.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-b0197fba32"
+RC_SUFFIX="-601d3b699e"
 
 inherit systemd
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c4fbadd761b6..739fc6de32d4 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 8a08f40ef46d..010e4d02fb78 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -4,7 +4,7 @@
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-05)
 # sys-cluster/ceph no longer supports x86, versions that support
 # it no longer build thanks to python2 removals
-app-backup/bareos cephfs rados rados-striper
+app-backup/bareos ceph cephfs rados rados-striper
 app-emulation/ganeti rbd
 app-emulation/libvirt rbd
 app-emulation/qemu rbd
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index caea569f2bf5..97e3a0faff63 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2020-05-14)
+# Dependency not keyworded on this arch.
+app-emulation/lxc apparmor
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # sys-cluster/slurm is keyworded on x86
 app-metrics/collectd -collectd_plugins_slurm
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 243fed2cc60b..366634482829 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -22,14 +22,6 @@ mate-base/mate bluetooth
 # on stable systems or force a stable upgrade.
 dev-libs/boost numpy
 
-# Brian Evans <grknight@gentoo.org> (2020-02-27)
-# Two packages are delayed during stable of PHP 7.4
-# arm, arm64 and hppa necessary to not disruput consistency
-# but this will allow all other packages to be used
-# Bug 706180, 710942
-dev-php/pecl-apcu php_targets_php7-4
-dev-php/pecl-yaz php_targets_php7-4
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7e3b27676be3..388ed4586aa4 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ben Kohler <bkohler@gentoo.org> (2020-05-15)
+# Mask 9.4 target to match <9.5 package.mask entry
+postgres_targets_postgres9_4
+
 # Matt Turner <mattst88@gentoo.org> (2020-03-25)
 # media-libs/libav is masked for removal
 libav
diff --git a/profiles/package.mask b/profiles/package.mask
index 55bb1aa73e3b..e9be4dac6ad5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,20 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron W. Swenson <titanofold@gentoo.org> (2020-05-15)
+# PostgreSQL 9.4 series is EOL. Migrate your database cluster to a more recent
+# version.
+# Removal after 2020-06-14.
+<dev-db/postgresql-9.5
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-14)
+# Unsupported releases with known security issues
+# Please migrate to zfs-0.8.x
+# Removal of old versions in 30 days. Bug #723120
+<sys-fs/zfs-0.8.3
+<sys-fs/zfs-kmod-0.8.3
+sys-kernel/spl
+
 # Stephan Hartmann <stha09@googlemail.com> (2020-05-20)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 75c1aad3645b..dc5649cbca46 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -246,6 +246,7 @@ app-backup/bacula:bacula-nodir - Disable building of director
 app-backup/bacula:bacula-nosd - Disable building of storage daemon
 app-backup/bacula:batch-insert - Enable batch insert into data base
 app-backup/bacula:logwatch - Install support files for logwatch
+app-backup/bareos:ceph - Enable ceph support
 app-backup/bareos:cephfs - Enable cephfs storage backend
 app-backup/bareos:clientonly - Only install file-daemon (client)
 app-backup/bareos:director - Install director
@@ -1428,7 +1429,7 @@ dev-db/postgis:gtk - Build graphical interface for shp2pgsql (shp2pgsql-gui)
 dev-db/postgis:mapbox - Add capability to transform geometry into Mapbox Vector Tile
 dev-db/postgis:topology - Build topology spatial types and functions
 dev-db/postgresql:llvm - Add support for llvm JIT engine
-dev-db/postgresql:pg_legacytimestamp - Use double precision floating-point numbers instead of 64-bit integers for timestamp storage.
+dev-db/postgresql:pg-legacytimestamp - Use double precision floating-point numbers instead of 64-bit integers for timestamp storage.
 dev-db/postgresql:server - Disable to build and install the clients and libraries only.
 dev-db/postgresql:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid).
 dev-db/psqlodbc:iodbc - Use dev-db/libiodbc. Disable to use dev-db/unixODBC.
@@ -3753,6 +3754,7 @@ mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/evolution:weather - Enable optional weather calendar support
 mail-client/evolution:ytnef - Enable optional TNEF attachments parser support using net-mail/ytnef
 mail-client/geary:ytnef - Enable optional TNEF attachments parser support using net-mail/ytnef
+mail-client/mutt:autocrypt - Enable autocrypt.org support
 mail-client/mutt:berkdb - Enable sys-libs/db database backend for header caching
 mail-client/mutt:gdbm - Enable sys-libs/gdbm database backend for header caching
 mail-client/mutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
@@ -6413,7 +6415,6 @@ net-misc/eventd:webhook - Enable plugin to send payloads to webhook handlers
 net-misc/eventd:websocket - Enable support for WebSocket protocol
 net-misc/fatrat:bittorrent - Use the bittorrent protocol via net-libs/libtorrent-rasterbar.
 net-misc/felix:bird - Use BIRD, e.g. for route reflection
-net-misc/freerdp:client - Build client binaries
 net-misc/freerdp:openh264 - Enable H.264 support using media-libs/openh264
 net-misc/freerdp:server - Build server binaries
 net-misc/gerbera:curl - Support HTTP media sources (e.g. internet radio)
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index c80adb185621..06cedf83a2ea 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index a3762634a224..5d7c44f7ad49 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,6 +1,6 @@
 AUX 7.3/folding-conf.d 339 BLAKE2B 93a0b3672777ad737ce27694aaca547634c375e180ad3c28c3adb9cae2cb1c054ff9458ee1fe04b70fe9841ae67d41198bcecfc4826d05d5de8df2759bd80910 SHA512 6fd10dc938262c05831e68176e93a24869bb6991508bcc48ece487b701788026561d073025bd347cd77ede13ca26f6b284861f30b07becf72ea77e4db22867b3
 DIST fahclient_7.5.1-64bit-release.tar.bz2 3438239 BLAKE2B 69fb60cdd5356fe4f5ad1f106b67d078baf0394c5d3c474dff2f1ac840bcb31bfd9ca9a9c6112b9ee9497dcdc223732627a21c50b455e46c096a52587d5d229b SHA512 5f6f2f882d57fe53ad0a55b48f09fc3803af6aebbbf0e92be39477d4c4da92237d6edabec61dd8183678bdcfe3923ff9b0938647a77edc2c69ce8958defcfdf1
-DIST fahclient_7.6.9-64bit-release.tar.bz2 3962851 BLAKE2B 896ca7cdd1357bb37cd8a5c438223c398c5f8c6bde7f7302d0e62ccff603b9a3dd3fb348bd021b9654867eb8f2579c91cfe87e3229b365620b383a4f261ae5f4 SHA512 0a360d8a985d3d538922a2d9519b70845a568f7d052c3047e7f847865165e9cd6e741016ee00496161ca3c2115beef34e95ab594d0f864bccc0fe12de6886f19
+DIST fahclient_7.6.13-64bit-release.tar.bz2 3951134 BLAKE2B 2748b7c1987d166bdda08caf5ff2f331523ff519e24768cd7e111c6d3a93f54c10c88d8adbf733230b6c51547360135dbcb272e5d43fd06d01918481601382a1 SHA512 f39f2990d78d075e1061ceaff9453b703a000770a3422965b7b8a91d1814f8804837628d8a34be5afd914228ef787f699f2488523baad295a8d9c1e3bb4f35cf
 EBUILD foldingathome-7.5.1-r3.ebuild 4454 BLAKE2B 9103461fe2614c5494648827b461cc488e7345f3ad12d45ccda6c44c81de7f700120d582b3ab4371974a5a25a62626b535849e8bafa13ac577c59364102cb7a3 SHA512 4c1a451a5df2e2015594f266761d51b9ac0978711ce93f4bc922937a0fa474bdead787926541ad42d554130cf6168e367f8c090648d52951ca6b7f1533c042f2
-EBUILD foldingathome-7.6.9.ebuild 4422 BLAKE2B 50f39d12b3c1bf23e94119a7d3a1434f7f44e1765ab77550e4561875be2e1b5b8ca1e00393ba1b218ebb12f54b4cc27721ee46586986b8771b8216ab6fe20e33 SHA512 1be3543d064a478e22abf386bdc634f5e63710aaada32fd035b4f5c1ef02bc01521a084430e9cc4fed17a677b51a62d811f5c74b1dca1b581b489f585d5d58ee
+EBUILD foldingathome-7.6.13.ebuild 4422 BLAKE2B 50f39d12b3c1bf23e94119a7d3a1434f7f44e1765ab77550e4561875be2e1b5b8ca1e00393ba1b218ebb12f54b4cc27721ee46586986b8771b8216ab6fe20e33 SHA512 1be3543d064a478e22abf386bdc634f5e63710aaada32fd035b4f5c1ef02bc01521a084430e9cc4fed17a677b51a62d811f5c74b1dca1b581b489f585d5d58ee
 MISC metadata.xml 360 BLAKE2B c0ef2b11cc9e6498a420dcd2e6c83ee71f7e286c3e78218257c56350bd2c0921732d48cc4207a31bcfd965a4a9dca65e9bdc4d62831dc430e86541d36fc691f8 SHA512 687f1516a8ec80270fa173b0a7d7c259f3f02ffefa69d3175b72e170bd11aeb786563edb43214390a83b6b61b1231e2734124e50bb2a523d1a564bc3b143f00b
diff --git a/sci-biology/foldingathome/foldingathome-7.6.9.ebuild b/sci-biology/foldingathome/foldingathome-7.6.13.ebuild
similarity index 100%
rename from sci-biology/foldingathome/foldingathome-7.6.9.ebuild
rename to sci-biology/foldingathome/foldingathome-7.6.13.ebuild
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 927b73daa6e9..3d31e7bb0178 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index cb4b80ab5f70..122faba02ca7 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -4,16 +4,17 @@ DIST gromacs-2019.5.tar.gz 33445791 BLAKE2B 1e2e2764b0c8774c878abf4f32c2fa7ddd9b
 DIST gromacs-2019.6.tar.gz 33446147 BLAKE2B adc21fb6b841b06d499607f8c0166a673645ef5af0b40bd823d0fff5ea24397e6301c5e1e0070986ae1ce1deba8a42052b66da148b071c1e21f2fe3908fee275 SHA512 7c227a9539e5775d5d128ae9e872a24181d79cdcd2852b86453597987e8d7332ecec371da65d089f6e610c54aafbccc8824ce298743383dd6240719ebee692a8
 DIST gromacs-2020.1.tar.gz 29153989 BLAKE2B b1c0313da945c57c74040c2bcd50495b238b0e131cc4ebecd74ae0d01465b47d732ea456a52a2f9d998cd37e2bfdb93d52bd15177328c4b7a14e6b1d8bc00117 SHA512 130394ec70e5d75ea451e9fa77c4ea2dd4adb0c51cc7663ac8579972bab7a0b75d9143d0eebb21802fc93305deca8831393a8cb3f51b6d01f9477f3dadece037
 DIST gromacs-2020.2.tar.gz 29144614 BLAKE2B cd20b031dcec32d9a797d66f2679779077910c184702f12f12093d92e8417d42e07bfb17a8fe63e9d29a889d5f57461b5f86e11adfc26635f8d2b5a5df19473a SHA512 348c80fad93b34e6703906fec97c6c2294c0803c326d6145776b732e1c33cd58e0967ddb2ec4799e3583542c09e7a6a015e4d084d60cf97b81b3a92253cca76c
+DIST manual-2018.8.pdf 10025023 BLAKE2B afb0a6e6a72d78df743fcb57e7c1716848589e571dd35167b957a9b407ca27978ccfb6cb9e0df9c9439b888f352501a00ba32281ed1e0b4193bd606f1d77152e SHA512 b1972f7ce965bfc9377542993c5943ea4868a8ed23a969d4203264746d6bea3a7a65c6379196ece37fd6d68ec7ec80f827bde87d1049284af7082759a124f1d5
+DIST manual-2019.5.pdf 12702361 BLAKE2B cb80429a59019b190115bf2af689c0df23b0fec6e41a9ebc9eba20977d1b06eed79044c906c41228883767f673140e15d3a5ef947a0c1ec4fe84012089f4fa91 SHA512 baf27961b87e6120c49abc9dc58e25d12a15588b4ac787e1a086748d488692d4a1262229ac66e550d3cca3a6042545fb6ec472a2c98d6a8698b7a18b4397f605
+DIST manual-2019.6.pdf 12702376 BLAKE2B c350127bc06a9eb3dee73da39037c84daeb89500e23cb131bd19a150bf60602d4dde7611e0c6f0f344af4093e96a899303dac71b4df56fd0c44c3a48a56606b7 SHA512 dfdff67c2c1c9ce1f1c236b7686c5331b0fe86951da6c98eddd6a3e748815e0be0a9653ae4318469fcdd913c4e7c355d64a997cc80b9d9fbe6282ef6d98e61eb
 DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
 DIST regressiontests-2019.5.tar.gz 67643634 BLAKE2B c4d9535d9a8a650869d67544ad5f367324f45e55325bb5074ece9b010f232f2f0dd97c9af97924d3f2368ed63015ca7330baff1cc681310e1439ec330b70ee8d SHA512 7c0917b76e7db35ab4e3271d523d268e0e2d858091e68ead863bfe6d1e56b381e30fdbf44f479f6e065c029e2eb27cfa0dbaa1b243f185144321aaf5084c55ce
 DIST regressiontests-2019.6.tar.gz 67643195 BLAKE2B 1e054e24b187946f7ea28090d4f20cf8e1d79a26253f57ba07d130e0773d8541b8a1552a38023d31a68ce8bc62d8e0af1d98609234bb3e7d3e6d567307ebb386 SHA512 eacf1c55b982515a305c29459fe80a7cd558a8481e5689962aa956148af542568b1d1ce59c6784ecb0afd4768c2b664afa21e12af2d89ae2b06b1ba61ad72036
 DIST regressiontests-2020.1.tar.gz 48541809 BLAKE2B 0fec2f0fb7fad0ad48bb790d7df6487e2c1931a0a2134795bf7da4a9087f0f2a3743288fc4ec057fa6b22412c2d8f312cfa3af38be8c5bea51d7a06afb5ac9f0 SHA512 664d29ce39629ed218de65179ce4a73e479d73d30bc96f5ae57624d7e4447298c6122dc09e7873b8cad458eaee0530866411fab20e009e46bf39b133e0de47e8
 DIST regressiontests-2020.2.tar.gz 48539492 BLAKE2B 08222ec18e70f551194fc0a060facda394c0d9999e162dace06029aa5f36e7237aeb2468a80d1198257a45fb076f8f633a7279a85976484900bf4154176aa070 SHA512 3066d92a59dafade78807612681d82a7b8a0bd9b74fa7e8784063a908418c55b4427482dc7feb261ff6981fabb2d64a800d3e90ed647ab45e201f4847347bac7
-EBUILD gromacs-2018.8.ebuild 8784 BLAKE2B 8c08b6c4f4278ed6455a0489b765c97c748835e49973bb83b7fe8e15d9453c8c9b6c6e26cd27a2d5a927aa87a36bfdef3874020f6658c9b2dcb774043e4547e3 SHA512 b66644847daa453b9a764faaa7f3145e16f3819d0d7ffdad12c1209a398cd03dbf7c2d60e0510f514b18f6ed8c09dfadb77bca6ff2f1eb044c65632842a7499a
-EBUILD gromacs-2018.9999.ebuild 8787 BLAKE2B 9edbb2ae0bd3f76af41cee9971b70fdc957f22bb61ec131abd3cf44a2da56c208b0b103f72754e17cccfa054d79c1e95a9477228b0c14f4476e58bd7656b641a SHA512 c4548c8436dadf1daaf7f4f41e3c957029a10f5eb7fd11c5c8f42046d2ba38c6baf9f47e69fb8e8eeef550e0463d76bf738d6f708ffce6b4cf556e29d725ed5a
-EBUILD gromacs-2019.5-r1.ebuild 9270 BLAKE2B 7bc19e1950bb824a0d30b6340ea181f0089f44237e324ec926698aaacfddfc33cc6a59644bf63ce56498f6fed80c3720e143f65fbd27f3b1e4fbbd021d08573d SHA512 651a096ed78b067b5d27591d64d552c2b31b759237375a278865afcb9123986a3e5c3785d46d54b71facf54b5d62ec76610eda0f7df6aed583c3b1e6b0a940e7
-EBUILD gromacs-2019.6.ebuild 9273 BLAKE2B f60f3d2c19fcbb406cee16e3ca0743eb72fffcfe7d0565ec69299c4315f72786197d83ae88b32b7f51312e82453555df3a82ea6d28f7ea40ab9f4628e66d62bb SHA512 5d5fb26afbd6c17ecf39685706337fe893171048bd745c4b6b2a6cf5d62a25c6b48f5b0ebff00b7d3a00d6731b0ef56701ed5236ac7ac1abf1d431a426638be5
-EBUILD gromacs-2019.9999.ebuild 9272 BLAKE2B 6d6484a75d2f6ec9d97a33766ff42f0a3b364f8d71f9d8c0af8265e1dffd9eee93dce6a4e7edf93fe316abef0dd8ec1ee0beb9b7cfa04f0ffbe8aa15cefb6c04 SHA512 c0e81e4312accad7377e9e221b636c1870fdf85928ca221c8272b7af6d2d422c2c44b4e6e3cca9818b922e7f194f1e45208e545d5a65e77d57aa29df1d0474dc
+EBUILD gromacs-2018.8.ebuild 7012 BLAKE2B c54d0bce4d4ffca3365f6f574313ebdf9b0a7e71a8bd7e10c3ffe10f7bddce9854cc4707d1c9f0611e3a0d353fe4ec215d3ee385459748d5266d98f1b5e861a6 SHA512 1de3a0dbba1c03730f7709013515d2282951e0e87e962dce8c46f227bf0e9ddc2034b28ac797c3c2feb81a1c27f1fa10136ea60c861d266ca708e3aac687b8df
+EBUILD gromacs-2019.5-r1.ebuild 7334 BLAKE2B 1f53f81589e531a292a8bf191064b446ea7b021c73df2645e1f8a2d793d7b7020f6908c7b90066f3e328eb78ed42eed91fb40ec98a08254c7538b29c31f9bdf3 SHA512 f57ebd19ee8f5653b7ec80e6981fced22014b8dc7f54be0a438ffe5db0de94f8b1db13b8698cce616544d04b65672465402a4057ee47924478a4d5dd59901c0f
+EBUILD gromacs-2019.6.ebuild 7337 BLAKE2B c12b7eb0e5a53c8b215fc1862b229c75d723865340d0eabd5b660feb613a9dec1482632a975a3f3689c90ada28096a04b819ebd8616f1de35fb1224b92ef85ea SHA512 4bee46c3a389251149573e391214cf3a8a394cca0ccd1c29f5bf827106580007f7e6dbad319a39fe637db5d7a96f4c9883bb81f0975dc214f8af89f0f1d50930
 EBUILD gromacs-2020.1-r1.ebuild 9903 BLAKE2B 505ad7efa270342c4561f75bc5c608f8dc24bbbcc1e9151af05c2c805651aeadc0109e4d5d6dd073f4e3eaeec90642ec26daccfd27cb96d3a5ca6ebf465f7b85 SHA512 ea4a1d7d508c7730a3e50ef459e59feed6de305a49f335454ee4c25124a31ca70de6a580f65320e0c3be93591fc352c4b0233f3482b0a4324101c4f00fbfd31e
 EBUILD gromacs-2020.2.ebuild 9903 BLAKE2B 505ad7efa270342c4561f75bc5c608f8dc24bbbcc1e9151af05c2c805651aeadc0109e4d5d6dd073f4e3eaeec90642ec26daccfd27cb96d3a5ca6ebf465f7b85 SHA512 ea4a1d7d508c7730a3e50ef459e59feed6de305a49f335454ee4c25124a31ca70de6a580f65320e0c3be93591fc352c4b0233f3482b0a4324101c4f00fbfd31e
 EBUILD gromacs-2020.9999.ebuild 9831 BLAKE2B 0d20f9e04a318eb2313d1b84adb9a747f4b70cc57446031da410e05bc37d2e3b53489110b803b69bcb235ea87dd913e9a7de6531c2e32b6afb9505c44a4d2dbe SHA512 c2edca500cd77e9b88f6b83cb4b3f11819adf313e4b68250d8b446466187e963bdd925665ca3aa532ae2c88b611f15b860f722cdf17c2b145d7cd58a56cb2c17
diff --git a/sci-chemistry/gromacs/gromacs-2018.8.ebuild b/sci-chemistry/gromacs/gromacs-2018.8.ebuild
index 3e5988a06d24..feaa75c10bff 100644
--- a/sci-chemistry/gromacs/gromacs-2018.8.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.8.ebuild
@@ -7,18 +7,10 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf )
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
@@ -49,12 +41,7 @@ CDEPEND="
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
+	"
 RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="
@@ -67,9 +54,7 @@ DOCS=( AUTHORS README )
 
 RESTRICT="!test? ( test )"
 
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
+S="${WORKDIR}/${PN}-${PV/_/-}"
 
 pkg_pretend() {
 	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
@@ -77,20 +62,6 @@ pkg_pretend() {
 		die "Please switch to an openmp compatible compiler"
 }
 
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
 src_prepare() {
 	#notes/todos
 	# -on apple: there is framework support
@@ -113,27 +84,6 @@ src_prepare() {
 	fi
 
 	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
 }
 
 src_configure() {
@@ -176,7 +126,6 @@ src_configure() {
 		-DGMX_OPENMP=$(usex openmp)
 		-DGMX_COOL_QUOTES=$(usex offensive)
 		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
 		-DGMX_HWLOC=$(usex hwloc)
 		-DGMX_DEFAULT_SUFFIX=off
 		-DGMX_SIMD="$acce"
@@ -238,11 +187,6 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
 		use mpi || continue
 		einfo "Compiling for ${x} precision with mpi"
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
@@ -262,7 +206,7 @@ src_install() {
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
 		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
 		fi
 		use mpi || continue
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
diff --git a/sci-chemistry/gromacs/gromacs-2018.9999.ebuild b/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
deleted file mode 100644
index 4db9e9672b08..000000000000
--- a/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( <sys-apps/hwloc-2 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
index dab1a95179dd..d5258ab6f232 100644
--- a/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
@@ -5,22 +5,12 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf )
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
@@ -53,17 +43,7 @@ CDEPEND="
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
+	"
 RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="
@@ -77,9 +57,7 @@ DOCS=( AUTHORS README )
 
 RESTRICT="!test? ( test )"
 
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
+S="${WORKDIR}/${PN}-${PV/_/-}"
 
 pkg_pretend() {
 	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
@@ -87,20 +65,6 @@ pkg_pretend() {
 		die "Please switch to an openmp compatible compiler"
 }
 
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests" \
-				git-r3_src_unpack
-		fi
-	fi
-}
-
 src_prepare() {
 	#notes/todos
 	# -on apple: there is framework support
@@ -123,28 +87,6 @@ src_prepare() {
 	fi
 
 	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
 }
 
 src_configure() {
@@ -194,7 +136,6 @@ src_configure() {
 		-DGMX_OPENMP=$(usex openmp)
 		-DGMX_COOL_QUOTES=$(usex offensive)
 		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
 		-DGMX_HWLOC=$(usex hwloc)
 		-DGMX_DEFAULT_SUFFIX=off
 		-DGMX_SIMD="$acce"
@@ -259,11 +200,6 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
 		use mpi || continue
 		einfo "Compiling for ${x} precision with mpi"
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
@@ -283,7 +219,7 @@ src_install() {
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
 		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
 		fi
 		use mpi || continue
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
diff --git a/sci-chemistry/gromacs/gromacs-2019.6.ebuild b/sci-chemistry/gromacs/gromacs-2019.6.ebuild
index 755bafef447a..e8541e9964ed 100644
--- a/sci-chemistry/gromacs/gromacs-2019.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.6.ebuild
@@ -5,22 +5,12 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${PV/_/-}.pdf )
 		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
@@ -53,17 +43,7 @@ CDEPEND="
 	"
 BDEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
+	"
 RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="
@@ -77,9 +57,7 @@ DOCS=( AUTHORS README )
 
 RESTRICT="!test? ( test )"
 
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
+S="${WORKDIR}/${PN}-${PV/_/-}"
 
 pkg_pretend() {
 	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
@@ -87,20 +65,6 @@ pkg_pretend() {
 		die "Please switch to an openmp compatible compiler"
 }
 
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests" \
-				git-r3_src_unpack
-		fi
-	fi
-}
-
 src_prepare() {
 	#notes/todos
 	# -on apple: there is framework support
@@ -123,28 +87,6 @@ src_prepare() {
 	fi
 
 	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
 }
 
 src_configure() {
@@ -194,7 +136,6 @@ src_configure() {
 		-DGMX_OPENMP=$(usex openmp)
 		-DGMX_COOL_QUOTES=$(usex offensive)
 		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
 		-DGMX_HWLOC=$(usex hwloc)
 		-DGMX_DEFAULT_SUFFIX=off
 		-DGMX_SIMD="$acce"
@@ -259,11 +200,6 @@ src_compile() {
 		einfo "Compiling for ${x} precision"
 		BUILD_DIR="${WORKDIR}/${P}_${x}"\
 			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
 		use mpi || continue
 		einfo "Compiling for ${x} precision with mpi"
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
@@ -283,7 +219,7 @@ src_install() {
 		BUILD_DIR="${WORKDIR}/${P}_${x}" \
 			cmake-utils_src_install
 		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+			newdoc "${DISTDIR}/manual-${PV/_/-}.pdf" "${PN}-manual-${PV}.pdf"
 		fi
 		use mpi || continue
 		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
diff --git a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild b/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
deleted file mode 100644
index b3fc105b550a..000000000000
--- a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 43d3b9621c0c..2fd116979137 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index c223b17c4412..17bd1d24fa7d 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-footprints-5.0.1.tar.gz 5074166 BLAKE2B eb8a532c83af37d241c0eb73b7ac0a6bdd75e87f5d06ebdb9a109160cae131240f4f5516c9bd38785c51e068ffcc29cdec075565bc4bc14af3924f814a68aa54 SHA512 16057e7a768097a7e97ae8a25d0c35891d04621e5d5b7437e80f893f48365e562b69c38a8076c1dab0455801359e766fcd1f7d31fec2cc78c9e7cda2d6f210ae
 DIST kicad-footprints-5.1.0.tar.gz 5370734 BLAKE2B 5a7c9db505edd37f5143cccb210a0f87bc08b1c9166c30a90b59af31f200e24c7608b210a6a3137095bb6eaad64f5f6909d87d685cd0d5cb080fb1f7e90ae575 SHA512 3ae6e35bcff8282b05f5661bf63b38681f1472c632523e3cd7288f2325b466b27708d850b95792084232399062eb54808b7bf08ec3880ac90d8a706c28e211b2
 DIST kicad-footprints-5.1.2.tar.gz 5389330 BLAKE2B fba830d4d9830125a4e52ac2e572e576a21151188d702c289f3f76302b44a30fe2800ff77e435d4e703995fd70cca83f237ba13a43170268de66c5d9402ca742 SHA512 1ca0682bedd74d304c327ac991f25a4d523dfb020ba560e117ab8e167036868703fd46662ddaa8ae1d48ee796fc607d45072ecf7936a3ba25070d83961897fb8
 DIST kicad-footprints-5.1.4.tar.gz 5578039 BLAKE2B f86a0a9f8d77df9d76c25e58c54f3e6d9ed7302bde3638674f8caa1a619a4cb3ffde384029fc896d82aa3535f195dc87450ab8ab5ffedbf194d83778d592b11d SHA512 84dee71a0e52d8bb4bc8d5708a0472bab9fae4ec47553e234ed8ca4aca926fa200593d264e016e688e2c0eb1fe4a680da8b8a5e48b7dc54866241d9965d235b5
 DIST kicad-footprints-5.1.5.tar.gz 5757316 BLAKE2B 1ae141bd01e3581314bdd5f5b79cc919f68cfc48427cd2b08d2910bdd915866ab3cdb542be860f5e10f01825f094fb81a0704e018f53d80a50950b8b150a5ab9 SHA512 dbfb482d41d1c109e1fb395d194f700e45f1c268a33645b71cd9d98ada32369fe01dd6bf10c7f767c65b9b4e0efa6fc1bde1e4c91b9f4b751540fe3b511ba5b4
-EBUILD kicad-footprints-5.0.1.ebuild 456 BLAKE2B b49fd1584b037aa4cf93ddc7b86ae699914c1c5838c4cdfeb3a09c11e346e0de0a8f37a01ec01cc975d959c84da0a7c1e311294b6927ff47385062e8987e639f SHA512 c16d4558d3e37f60382c05c18aba6fefc431a2c884d4c1a93685f394c5ab42cc423770d518d65ab62007d10ad6d64047ee7a517c953388c0d9b19e75a11e4429
 EBUILD kicad-footprints-5.1.0.ebuild 450 BLAKE2B adb4de1d7a16e5d61b0e574120f9bcd44a9011e1ca74348a677b8b92b623f8e91d6004e0c5c434fc8a8ab4d166cfca6cdf1f2a9ef4288b26fe16605dd78e9930 SHA512 10f23b38d7096247d3b612b3ea5ba4547161e4126979371a42a94312c6af68dbd925f886320026956b3db9b796de72f3f746a5c28688b3ed78991622cea959a7
 EBUILD kicad-footprints-5.1.2.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
 EBUILD kicad-footprints-5.1.4.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild
deleted file mode 100644
index c34bd2d47161..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://kicad.github.io/footprints/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 7044a52844aa..f29d80f7f815 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-i18n-5.0.1.tar.gz 4062609 BLAKE2B a3113758cc1e813fca97abd9c4e5ca367f974900b6ca7072c55eef9d9eff6274bacdad37b81a98f650c05be8fbdff306dc59db1cdd1a22b4d0776c9a89454303 SHA512 5254f6f945fa63e56bc3e9440cf506da3a4ccd76a58fd7e052a04ff60ecaa0daf6ad0599376a5175a4628d40cb1e317973e470a1593714186adb393c20761e24
 DIST kicad-i18n-5.1.0.tar.gz 4332053 BLAKE2B 41292da8e5d3d686641fc8f421f7da585ee625586508dfddab03088ad213fbe3a83d54c504dcc73c885443390a83e998afd56fed06bb12277ff0003f03da3215 SHA512 c1d971958376d68fc7ea95551b8407344494b6babf807063efc0e392713a4807a3dbda42dc0d3c85035c7cfe19b2d5a139efb0a6323db642fe29852d0bdfccea
 DIST kicad-i18n-5.1.2.tar.gz 4263653 BLAKE2B ea85646cd6568374a1492be9119771c06bce1113c32360c653dc5b54944803c8fb99d1bfb6f8cde2502873215c99238afa7c2a66ba652f7815b9f0d256148a5a SHA512 9c7bb6a3d33442c019669f6bfebb6bff0cf49afaaa58772a70eca3dafb8d405d29ec5338e622af9c97c1cb0a9463a548af43b42178dbe6e647cad1d2638652a0
 DIST kicad-i18n-5.1.4.tar.gz 4310971 BLAKE2B cbd58b689d1889bc492837f00a62a3ac2a1c570a868b11911ea00d40585bd4d56a045435b1aa28fe0cbd374f5750d2e5ecb14e674ae9f2969b509057fbc95716 SHA512 28993e0021ebd7f3c0e7e21b609f57b85b95c74c33d65d30e707c5194b340dbb46142a6250a19256c927dc2f0600a7e1de723aefa9e74b2761ebc7c380143527
 DIST kicad-i18n-5.1.5.tar.gz 4330450 BLAKE2B c111073e97dd35d7545acbaf055918c21375bb4fef3fc9cbc81470d990e8103f0fbd7daf8117531353171239d6bbcffe195fb5933794c13c3978a9cdcf94bda8 SHA512 68e6602fcc7e73c22a594b45ecf53a956af8a134e28e86242bfaa4087df21c04b24ae4df9928f00c2cee7eb0631a02a4de1cd09547b36a466fb324f983ea5363
-EBUILD kicad-i18n-5.0.1.ebuild 471 BLAKE2B 4ead8d717ce3a8c3b4f9451b806812647787507a4ccaa8d925aa2f81539c21468cf4a63b37c3cb017f9d938f17f036f11cd25e41309f41ccad22d3ea2f01222b SHA512 93715c5579ae737a6418597f87e1fb57cc75bbc9085faf84dfde5302f8d01b599602ac403145faa6b29feb73f9f2ab0934669b9a6e9c16f401530ef0a9e58a63
 EBUILD kicad-i18n-5.1.0.ebuild 466 BLAKE2B c046452f4f93fb0f07450f287012cde695d4ec04fe9b8739a91639eeaf4c1431f45ee02ba24b64710e69efe65f9a644293f5c6efdacb14be807736247a7629b2 SHA512 1e85dbe9b97f3c0506cea3abe14df09efb9434f743d9bafd1b368a23f661bfe070a2261d4380f14d77b76e0ff0ba0cec9ca935cab9f2bb2920dd1bd79020cf9b
 EBUILD kicad-i18n-5.1.2.ebuild 459 BLAKE2B 4fe20cef10baf977fb3ef550ebba403f99c614cbdaf9733fcd127ec9c3d30caa1a9d90a64515c0e5200f34dc3b237e776052ddc2e13a5786c4e381ded787ffc1 SHA512 60c0644549822e8767939c5eb42147ec2ce2d81de314b3a4b569e8bd7732c1518907cdde65d93ed8503fc92f829709dd729db3f6f1b7b719e72d46c2aa930fba
 EBUILD kicad-i18n-5.1.4.ebuild 459 BLAKE2B 4fe20cef10baf977fb3ef550ebba403f99c614cbdaf9733fcd127ec9c3d30caa1a9d90a64515c0e5200f34dc3b237e776052ddc2e13a5786c4e381ded787ffc1 SHA512 60c0644549822e8767939c5eb42147ec2ce2d81de314b3a4b569e8bd7732c1518907cdde65d93ed8503fc92f829709dd729db3f6f1b7b719e72d46c2aa930fba
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild
deleted file mode 100644
index cdd652ca69a6..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations."
-HOMEPAGE="https://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 3bbeb63a2956..33d77a9457ca 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,4 +1,3 @@
-EBUILD kicad-meta-5.0.1.ebuild 591 BLAKE2B 0ecd15509f5670c65f14efee4bb8a070359fc1cacff48d0bcd97bc77fbfdcd159c68b43052c502e5afa4a598e811e5274fcb42069f9f7ae670f7feb9e5e0927d SHA512 c9b92be8e65e935fa2b29d62a0a8e740fd8bc1b3e7ea87345a63b57f37877843a709494e2fcfffb68f223ea8f8655dd9a0fdb13985bc7b5021ece24dc01d907c
 EBUILD kicad-meta-5.1.0.ebuild 591 BLAKE2B 89cf50dc0d7696c295f7f1f7971c6257075519f3ba975d9b22c1685fdf11fc9072b476ce63e6e4b8790d7749d4a535418e31b2911969adad4a28827a2fd22616 SHA512 69a516e5c0a619d98ca28596b28016d460ba650bda2d2c22ad111f98117e061fe308e53c46209b900af7f1a40c0e369d09b3b80206ecc16a1402f9ec8b72f221
 EBUILD kicad-meta-5.1.2.ebuild 617 BLAKE2B d66ce1689db271ad6cb5f9e4ded2d14bca770d2685fd3da1911225ed9eb509679ebb8e3ecd8224feac48d0b1570ef2be2f9a7e59a11c62da4e4b05b32a333b9e SHA512 b9c98d3b8fe0e266e77f06ac0608453ecdcb6002058652e89a6f92a0f68da896219383080d9c8803b91ff3bddd570a867010fc999e7daf49c36e2363615ac7a2
 EBUILD kicad-meta-5.1.4.ebuild 617 BLAKE2B d88bce44a5465546b6117d1a1374a339e325067e4ad71ec9e32790634972ab2d0c617d1bc73ec5fb01e9c2721d765a01f0896e62a4d06d0ccea08978143183bc SHA512 938792ad43afdf1721911d485708d929df8d7052e25c7874175f0db878dce10ebef03a2088c8cba4289fa6a26723b509f715e3fe3bd0a8e556beef9e23ff2349
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild
deleted file mode 100644
index d98d94130d20..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.0.1
-	>=sci-electronics/kicad-symbols-5.0.1
-	>=sci-electronics/kicad-footprints-5.0.1
-	>=sci-electronics/kicad-packages3d-5.0.1
-	>=sci-electronics/kicad-templates-5.0.1
-	doc? (
-		>=app-doc/kicad-doc-5.0.1
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.0.1
-	)
-"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index a386143ce0e3..0bdce652a2c6 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-packages3d-5.0.1.tar.gz 791951390 BLAKE2B 31c10869d53c7fe262bc90c721d0e99b1381e5faaf157597f5c58b00f328ab654260cc306466fbdb3ed6c48e71d21b48e74365d62aca009a2d3b77c0c3feb988 SHA512 8f188c5b97904eca0e564ccbdf29c0b6cf99fb60290f3c11a22d4c38c91edb3aee20412be867eee84007e39d54f808cff713f6252536045d92e891ed735ed334
 DIST kicad-packages3d-5.1.0.tar.gz 867189320 BLAKE2B 6f7fd81f56fa4e731cbac0d0e59ed916a5e44d8e5116187d3069a2cae9b2920fc7bbca1014c1f4c3c6626b976b0ee71e9bf31e2df48e5f9f381cbe9c01c37f53 SHA512 31ead3cce5d064f7970dc0e88e23a2cdda2f8370ea0ddb6fc5e7364e52bb3d113e4e71f8f08951e284bb4d40bb6f5750ecf40480c4b26d61e59ece81d43018af
 DIST kicad-packages3d-5.1.2.tar.gz 888156027 BLAKE2B 09f5509c4387c0de9649bc926c3f57dc27c90f0e74dfdfb20943b755a3bf775454bdb31f3fc46da98befb86981570c48d80192c9998c7119062db94149a0e10a SHA512 21f59182ebe9fd65ae5bff050da2504f5418741c7390c6a0024bfbeb0dd701f34de29e2f2f5b08b94d512ba22c1a72facc51432a0858770916206300129ff4ad
 DIST kicad-packages3d-5.1.4.tar.gz 888665659 BLAKE2B ce2299b890397e7483ce609fa0c9a4f16b8940e32dcb942b97907fbc5168577d028e445d119c24a9dcaa4134de0ef273a60caaed6dd6caacba12640f73e2fde6 SHA512 39f6448670311055e74580cdbb196c71d184d0ce9c7b7ba849812cae3702e08273c1fcffe1ba6203ef6b5f54aa83845c4238c2b154eae44930dc411f8749201b
 DIST kicad-packages3d-5.1.5.tar.gz 888817126 BLAKE2B 1b515e3a2f81b0273491ba90d210de1ff43eed625eaff1c774fd969a3255d89c4ccab2ace3087210f5ac2012e0df75bb62f1683c89bcedf60f1c3f03ec2c7abe SHA512 844de269cd9c1c0c4082f09097dc853cd49a2942f621229604b9996c61f8e1c1a0b1008201ad2e13107a07b3f4601601f2d361b60b6e62984165dcdfd1dd378c
-EBUILD kicad-packages3d-5.0.1.ebuild 559 BLAKE2B b98b37dff0374a0836cb62800c004de6cfe6118244ca39e17984f506208b8c33a12b754da7ea6836024b4f3633f920fbea6fd1927d60fa192b8442c786a6ba3c SHA512 d92316f8ec0a47262b2cfd41f4e559451a0c8fbb135559642c69a35362d0a445d8b27c80a9fd90052b981528b8bbec8a681f849675534f319b58978e3466a221
 EBUILD kicad-packages3d-5.1.0.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
 EBUILD kicad-packages3d-5.1.2.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
 EBUILD kicad-packages3d-5.1.4.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild
deleted file mode 100644
index eebce77a2264..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="9G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 1ebb8663aefd..bdca4035eaaf 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-symbols-5.0.1.tar.gz 2715790 BLAKE2B 5b87d64967c181161309d17f21feda14e6b44814ca9ec77ff9408d8a1d55805eaafea40bdb8ab4964c3fd66832ffef45e6c8c857816036586e5b8f4a33e34c4e SHA512 f0c3ee981cd96a57eed50b1e5a6d7956e0f73edaf86f1afb3a56b93d31161fe0a567d60f02339b3a2e9b9377b7176e9097484035512a40c4ca3a98341dc0056c
 DIST kicad-symbols-5.1.0.tar.gz 2837674 BLAKE2B e21d74e9b2e70bd5fbcf4d299ba65967ed3d1c7556bbcb12e9881e3cbf1ca224b2285f142aa3536d95c0e06b025590a3126128edfdf64f68341e9d73a5d14798 SHA512 6c0a193955c0a0219dc4fd60f5a214fcdedc2e38da5ddaabc72f829bfe0988a6a447e65a48908c00ba766190bdcd3e1a9505ddd66062c2528e431dde58f07e99
 DIST kicad-symbols-5.1.2.tar.gz 2858506 BLAKE2B 71642e4585c647a160a2fdd11d991c0044be3ff7a7521181adc1dc8b1df64404e538810f33dcc88c6690d640df2e4c54527ea90913a4ddd6f3bffd74d821043a SHA512 4cef0c98da2fb408ea4170bfbfed31c6b7f5c2f7d49061f86fac98c1acf52fbc035ef10833874bfad5c7efa4643ebf6a989d30e5035038a54d208c3bcc61bda2
 DIST kicad-symbols-5.1.4.tar.gz 2897335 BLAKE2B d5bb84056b2f878dbb2ceee32a0e2e2976e1f5d76c35dd16f958f84cbce72e186cd03c2f52a9b511c0e9d24028c9c43e20190aa141cd8f7b854ccbd58d48de7d SHA512 573dd74d5d3c2b32fc12499826a9e43e5d63649f760c91e5fc3d7a8acb44b2308bbd70facc4f29d139dd895ec26f0feb1d9195b2194131e6c13397d030464fd5
 DIST kicad-symbols-5.1.5.tar.gz 2922505 BLAKE2B 98c121139b8847678e6aa6a657c23168a7468c9f2ba342f335ba8ce373d6352b985db8b6549f9bfecc914eed686aa14bcb5b3112772f945e50e0f9c1cdb40a33 SHA512 345c7990ba17f778fa975250fbb067a01472aa6e03cbd08a1e34203af5517981b6a569981e30b4d56e58a3966c364b529b9679a96a46ef538bd5ac6a6b46eac7
-EBUILD kicad-symbols-5.0.1.ebuild 450 BLAKE2B c0fda1a73122892636ada55e4c7d63cc667f71f02516bc7847dd10e42de2a5799b7d750ca03c0781113e725db0403a7eb8a35f60d9a8df7daba4b6e8f96f7c41 SHA512 930424dac84702ff3cac707dbd3768b4bc66c991310f6be275ca658c5768e4bcac66d18eaa32e5e4643efec4e2d752bfac0f265c2a239ecb1e92eec3e246f1f0
 EBUILD kicad-symbols-5.1.0.ebuild 444 BLAKE2B 65693d6ac0ceceb7bd765f4c823967c8d2b11cdfe6cbdc12b2b8e23bdf2c3bbbbf08ffbf64b9a193033ba45583996cd1b6d4e763ce3823b29da7bed9ec281da1 SHA512 a054cc56e9d2fb749cd4fcab1732eca1919e7aa7fdbeefbe501bfd159390745f267be424adf8f4b5b719b8f381d9b21e8a88d49e3c44bd9ab078a48b610565fc
 EBUILD kicad-symbols-5.1.2.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
 EBUILD kicad-symbols-5.1.4.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild
deleted file mode 100644
index fcd882fdde86..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://kicad.github.io/symbols/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 3636fb4d948a..ccf542b330bd 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,9 +1,7 @@
-DIST kicad-templates-5.0.1.tar.gz 1621185 BLAKE2B c21020ba11ff01863e5c8681247f8e17c03d06532f7eb6df94de8c6cd64f51142d54a762f83168b6c4f0b9c96764cb53d220eb6fd237c517fa07bfe51105543f SHA512 ccd995cc39bd578a95b1b3fdbe53a7bb8dd6638aa5717cd9a930371b0a48e66f1783ba3abce9438c7c29ab3b2b0a9075acc0b9c42eeb73480abf170a6f784668
 DIST kicad-templates-5.1.0.tar.gz 1620695 BLAKE2B 3b66560639d6df31f6b5f5e579aa5616d6483d445ff7ab1fff0d055d5bc96979c181fa27039730b19d9957f967d1f7b3cdc00a1d7d9c4a1aaf7a0e0081ced43a SHA512 59f29b205dcd7cd4ec883bca79d2a2e8736734407d9bd343316dcc7321bd84800415c24f9bc397e67b6029b2c1226e9a9806fc86fb52829f841788421a78e89e
 DIST kicad-templates-5.1.2.tar.gz 1620807 BLAKE2B 8d243cda34bfed210adaaaf893770808df8eb21ac529818b9b6108a1195b50cab27a7ebcbf20e6b549c83285566722958641524b13bc714bdfc4e5115e48f45f SHA512 789afb4c96f8cc7cfbb9fbd632026478862e38ae972466d49e1620c75e30fd3e38f13155e49bec79a04211e5628152a55b62c847e229d582025045023f2ce8ae
 DIST kicad-templates-5.1.4.tar.gz 1630338 BLAKE2B bdebce3e9c83b0d229c432d96e6d51ce506650f2c4231c3153b94d394efd5e430755049d687782d715d313cb0e0af08c00c4b87497fa55b0d9bd447b8b096fdf SHA512 20409524ba8e195b774c703bfa99bc6d65d8fc46de5fae5cc5c3f5f37d0b9115cc56d116262ac6df56658840b2b1c7fbab65c9ac9fd1bfaafb56dedcdf691bf4
 DIST kicad-templates-5.1.5.tar.gz 1634911 BLAKE2B 899b692de58660eada32a9f31c01b0b51fa5a6233da2395285b8526df411be6260ed07f4f7dc637229874d849d144597822fbf19be1ef48d09505d5bd7a0b216 SHA512 9836ac57d8f0e394eb5bd9a05fb73dd25dc4c0d3dfe20a1271c59b7247b9af2b38c01dd14706add16ba3eaa26d79a18052669ef6404ed3eea0d6ad6d7767a9fa
-EBUILD kicad-templates-5.0.1.ebuild 459 BLAKE2B d79ddb7dd35b96c1739f4e785c90c35654a982f5f4ef62d2e7e1334e9aa17597b87da0661934680e5b32ee20d99e67165cd0d92c8991a0e620f718fd2db1d1d0 SHA512 8de9ec54219987cd1bd69641c171fb5da3ae76f98bd7aeceb004bba444dd6e6d766597d61b85c46058a67f7748c5262f3fd3d9acc06e44d215c1866ab46ee625
 EBUILD kicad-templates-5.1.0.ebuild 453 BLAKE2B a8b79b4a24d2cfccc89322a878ac53257905245b0141c26d51e4615b48816a2b9d62b278ecc43526030a3b78c2e5d0538ac2eb3362976670a11b0775848dec65 SHA512 c941b5019b8b04db43d01d25f04d7a1b300a664818c478a8c6d0a70564ddec0c241dec9f89e183026fb3b620cfed4648b76c97b5b482a0d0506461bdcc506f5c
 EBUILD kicad-templates-5.1.2.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
 EBUILD kicad-templates-5.1.4.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild
deleted file mode 100644
index b18feefcca85..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 7a456878a406..d4dadec3e3fe 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,16 +1,16 @@
-AUX kicad-5.0.0-curl.patch 568 BLAKE2B 6a6d4d382f014fa57a5af8af27e6090f4c9e7b8c9454ee09f039c472f0089f0d9cb045d435b5193d6da4fa2a24dd5a859f7905b330d9bbbd5b0fa4cf116e8512 SHA512 dcb7a260f5acda58dcfdddd59920df02b8003b1727728c90076770fc67b4e7c47050b915e3d634612077b66d1ff62b6409111ee1003c443f48ea6356eeb59841
-AUX kicad-5.0.0-help.patch 4683 BLAKE2B 6b3e3d3567e0f554346ad2eb30b3af9e7ab07e77da2675513dd040e85011f6e711701c0cf3909399f4fe2298d7d59e71727583240d3e06701c18b4c2f59090ef SHA512 570fb711ffb18c7201e7a75791d1cc370493975d19e125de1ff6a78107b5fb70868975efd7d2a8ec921190484f7f91f723cca52337ec2e36f860b73dcedc3e7b
 AUX kicad-5.1.0-help.patch 4690 BLAKE2B 5459e3e7fde22590f4357ec3981c9bc2d784f533cc0370befb6851fb01954923722c815aaafa4dcd37f15c74bc31fd3b711ac106301abeb195dedc8086965c47 SHA512 ed5c70b0157ff4db152e2374df669210b194147655c7c5083ffb2f5ce56358c30c4cb2aaff2368f3a34757e5a5021b335ce169727eaaf511b12d1ceb3fb9a350
 AUX kicad-5.1.0-swig-4.0.0.patch 623 BLAKE2B 66d3974741793b84a192d9223e739deddc544c230a8618aa78db1fe48bec1a632cb07bfcdb0b01137c1b1e4cb7d5fda4330c7cb717ea894d6279660752056e7b SHA512 c43552d6da296cbc11232f565a9525fc707304e9a823e4e003d998f4ef013d82708c7b17b4bcef82c661e0f53e849d372c089a077a356b006db3523ffe82892a
 AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36
-AUX kicad-5.1.5-ninja-build.patch 2143 BLAKE2B 0bc1cab18ac65652a14f105214ef526bb589b3dc71073c75c415f722bda231e55f74c6b1e0132523d2bfc2375424bd58ba03437f1a020e49a495fd68bc826d38 SHA512 d54a0aa7382ccef8bfc3be0df87fb72761c4467a425268aa8a6f37b2968ca18ac9f0fc41b7b4e4ea2285e724c643a9bae5c26df13ea3db2d2fbdd4f08ffe7732
+AUX kicad-5.1.5-ninja-build.patch 2171 BLAKE2B 1b9c6f07abed53e04f676f9aaea6f4e244ca0293e725a81c4d1037e0453201f00cc1d7267b48793c11f0715154762240fefb48ac3b3efcb905857eef76016c66 SHA512 e0ca5eb4695948934c89f3a19edb8dbb77c34039d65c5c0ffaa42c16c5cab0cc5537c747a2f9c2e154be9861f8171537fec6004208b91f32736f521465c959a4
+AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
+AUX kicad-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f
 AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee
 AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc
 AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
+AUX kicad-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585
 AUX ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
 DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad SHA512 644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
 DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e SHA512 5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
 DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b SHA512 ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
@@ -18,9 +18,8 @@ DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
-EBUILD kicad-5.0.1.ebuild 3518 BLAKE2B 15af18ad991caad4460be0cf829db0976a94e4fabce761f7b7818114af96043a75d1da0ec678a707a975a114a94d32140806543742a21f8f835633b5e13ccdff SHA512 81425f12c0d9af2539d7d1cff5315981a3bb35d8e542b8cd7ac0e1a1bd25f7ac8273d3c5057de8987ab3351f40cc8f894d66aad75aa6e709c9bbcd03d45f72ca
-EBUILD kicad-5.1.0-r1.ebuild 3595 BLAKE2B f984c162f1428611d095d59e50a0c8b59b4c8d45b7eb2e5b2db3c19839afbc641a4d2fe12679885a11ba3b9153187cde10e2f357d3a3152b4e29f241f8e297a2 SHA512 0789cdbeb5c9b9a15b64747da7b9ac5e35137e04575b8892d3f3cb0b703081f039c779d616d9ee9b865872fc4d94f42c4cf9e1c502a4a42c1441903e85ea1e2c
-EBUILD kicad-5.1.2-r1.ebuild 3671 BLAKE2B 6d616a76af85f50bcdcd4ba41309bb751d1f6473ab80a324d7ba1605dd03058a905d35b9c33191e3e8f0947a543c9d81d237f26283fda497c3be7ab76e220f47 SHA512 da8bac8636848543650a31bc5a9f5393c0777aefb34155e77b909027349d3a6847587611d8c217069e91a84c9738d3713df7a450b418293cf9da93dc7c366296
-EBUILD kicad-5.1.4.ebuild 3635 BLAKE2B 2490a6ff3792c72d40f46a068fa6af55f5621e0e5149856653a43737ea3fb9659b0d878a31bbd1baa5f682cbca2a508bbff09b610e8ced2d66e9d54e130e17d8 SHA512 fd2481a4b79a589bbec56ebae97a418aa21871e9b6398d4f902136e9048701170956e8da76b795b76176006236463a64a983faca816c77a2603c1d697767108d
-EBUILD kicad-5.1.5-r1.ebuild 3656 BLAKE2B c3c907983477480d1b47656308eff72d2010b6bd58bfaa4f9a44835ad797132668174c66dad66bcc61f6b589338e069dd3a53d3fa176e62b2c22c11ec7fb7e28 SHA512 7b95fd83d76fce248fb5031c3c255086330fe01a5fdc184763e1e76b0f8db010f6514b257f477004b57d089f1f6f7aea642a6781ddba4a8140a81806318ebcfa
+EBUILD kicad-5.1.0-r1.ebuild 3599 BLAKE2B 29f32dd7320c26a0522f11ea53683681245dfc99f9c64a6a2da859560d69092b9e7e6bf89353a53dbf5d736a70db11a1056b2b61ce4ac170736cc7ad9f307475 SHA512 dca933f4b6fd96bd57cd6973925b5552082355dc1ce2ddde8f028628e0a7200dd494bd03b91788ed6e1cc057d240a183689751bd9bb44e13ca37dfc5329084da
+EBUILD kicad-5.1.2-r1.ebuild 3675 BLAKE2B 48fb984e78eb3dfc2423b014c9312d05950a987695ffda2b63d3a3e3854496ce1039d5c14968c97e62a4b29b6d19596790492c3427be0cc2cefb714b6e0fee54 SHA512 6d89d89410d1a81aeee929de11e462b13d716d9c00a4552879530ad40df2f72883a91f5b9d6dd29dd37b811b060be1c7791e03caf84afb09bb4afe9b0854a3b1
+EBUILD kicad-5.1.4.ebuild 3639 BLAKE2B 2f140b6583965c2287a9a6e83f450e741455b34239be39c2ea87930569e487434507e21041c661242bbcfc4cb6eb5e8276551c4b100f58796f16b5c22b221054 SHA512 bbbdd68f196db3e4ef28f88695295e4e2f32960af970813cc8b17362fc3949a76556c0f659631cf5f0615d7a2cffa49ecc8654127f38b5c9c18c5f10e4060089
+EBUILD kicad-5.1.5-r2.ebuild 4333 BLAKE2B 5718da8e06510a5ded9db43da56acff9175016771f5919439e56003a172e6086cbb44b74bc83170660866142461c81017ab8f76b08ab94bd78bc474d7db5a92a SHA512 25b5a64bd0fbef7eefef88f6a5af4f0d758979d003cda5faee3f28f748c2e9d1c3dcf6e99ffd643d4c2cb42f0903bcf78facc30ff59670464d129f1bf90ac616
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
deleted file mode 100644
index c99071c0a548..000000000000
--- a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/common/CMakeLists.txt.old    2018-09-13 16:21:29.642915273 +0200
-+++ a/common/CMakeLists.txt    2018-09-13 16:23:25.146914833 +0200
-@@ -337,14 +337,17 @@
-     list( APPEND COMMON_SRCS strtok_r.c )
- endif()
- 
-+if( BUILD_GITHUB_PLUGIN )
-+    list( APPEND COMMON_SRCS
-+        kicad_curl/kicad_curl.cpp
-+        kicad_curl/kicad_curl_easy.cpp
-+    )
-+endif()
- 
- set( COMMON_SRCS
-     ${COMMON_SRCS}
-     system/libcontext.cpp
- 
--    kicad_curl/kicad_curl.cpp
--    kicad_curl/kicad_curl_easy.cpp
--
-     view/view.cpp
-     view/view_item.cpp
-     view/view_group.cpp
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-help.patch b/sci-electronics/kicad/files/kicad-5.0.0-help.patch
deleted file mode 100644
index 0fb43c3550ce..000000000000
--- a/sci-electronics/kicad/files/kicad-5.0.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt
---- kicad-5.0.1-orig/CMakeLists.txt	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/CMakeLists.txt	2018-12-25 00:04:50.423849671 -0800
-@@ -418,6 +418,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur kicad-5.0.1-orig/CMakeModules/config.h.cmake kicad-5.0.1/CMakeModules/config.h.cmake
---- kicad-5.0.1-orig/CMakeModules/config.h.cmake	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/CMakeModules/config.h.cmake	2018-12-25 00:04:39.215828924 -0800
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp kicad-5.0.1/common/searchhelpfilefullpath.cpp
---- kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/common/searchhelpfilefullpath.cpp	2018-12-25 00:04:05.576771741 -0800
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- 
- 
-@@ -68,6 +68,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -75,6 +79,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -103,16 +108,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( wxT( "share" ) );
-     subdirs.Add( wxT( "doc" ) );
-     subdirs.Add( wxT( "kicad" ) );
-     subdirs.Add( wxT( "help" ) );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( wxT( "help" ) );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( wxT( "doc" ) );
-     altsubdirs.Add( wxT( "help" ) );
-@@ -158,6 +164,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -187,8 +196,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
index 3aac927b5bd2..3b4b6a4d2fef 100644
--- a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
@@ -13,8 +13,8 @@ diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt kicad-5.1.5/pcbnew/CMakeLists.
 +        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
          set( PYMOD_EXT "so" )
      endif()
- 
-@@ -827,18 +823,16 @@
+
+@@ -792,18 +788,16 @@ if( KICAD_SCRIPTING_MODULES )
              DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
              )
      else()
@@ -41,5 +41,5 @@ diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt kicad-5.1.5/pcbnew/CMakeLists.
 +            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
 +            )
      endif()
- 
+
  endif()
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
new file mode 100644
index 000000000000..b01a6b7d79f6
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
@@ -0,0 +1,25 @@
+diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
+index b265e2363..eb1187d86 100644
+--- a/eeschema/dialogs/dialog_spice_model.cpp
++++ b/eeschema/dialogs/dialog_spice_model.cpp
+@@ -34,6 +34,7 @@
+ #include <wx/wupdlock.h>
+
+ #include <cctype>
++#include <cstring>
+
+ // Helper function to shorten conditions
+ static bool empty( const wxTextCtrl* aCtrl )
+@@ -804,9 +804,11 @@ bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& aTime, const wxString& aVa
+     float timeF;
+     m_pwlTime->GetValue().ToDouble( &timeD );
+     timeF = timeD;
++    long data;
++    std::memcpy( &data, &timeF, sizeof( timeF ) );
+
+     // Store the time value, so the entries can be sorted
+-    m_pwlValList->SetItemData( idx, *reinterpret_cast<long*>( &timeF ) );
++    m_pwlValList->SetItemData( idx, data );
+
+     // Sort items by timestamp
+     m_pwlValList->SortItems( comparePwlValues, -1 );
diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch b/sci-electronics/kicad/files/kicad-algorithm-header.patch
new file mode 100644
index 000000000000..aa118ea6f860
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-algorithm-header.patch
@@ -0,0 +1,11 @@
+diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp kicad-5.1.5/common/lib_tree_model.cpp
+--- kicad-5.1.5-orig/common/lib_tree_model.cpp  2020-05-11 00:36:36.568301297 +0200
++++ kicad-5.1.5/common/lib_tree_model.cpp       2020-05-11 00:37:50.472359703 +0200
+@@ -21,6 +21,7 @@
+
+ #include <lib_tree_model.h>
+
++#include <algorithm>
+ #include <eda_pattern_match.h>
+ #include <lib_tree_item.h>
+ #include <make_unique.h>
diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch b/sci-electronics/kicad/files/kicad-metainfo.patch
new file mode 100644
index 000000000000..48a5ef5be507
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-metainfo.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
+--- kicad-5.1.5-orig/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
++++ kicad-5.1.5/CMakeLists.txt	2020-05-11 23:51:52.122093410 -0700
+@@ -919,7 +919,7 @@
+     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
+     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
+     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
+-    set( UNIX_APPDATA_FILES resources/linux/appdata )
++    set( UNIX_APPDATA_FILES resources/linux/metainfo )
+ 
+     # Install Mime directory
+     install( DIRECTORY ${UNIX_ICON_FILES}
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
deleted file mode 100644
index cb1d50631ac0..000000000000
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		sci-electronics/ngspice[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}-5.0.0-curl.patch"
-	"${FILESDIR}"/"${PN}-5.0.0-help.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${P}"
-		-DKICAD_HELP="/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 8c93a13852a0..558341e09d25 100644
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/freeglut
 	media-libs/mesa[X(+)]
 	ngspice? (
-		sci-electronics/ngspice[shared]
+		>sci-electronics/ngspice-27[shared]
 	)
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index 377f42f962a0..0afea3166881 100644
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/freeglut
 	media-libs/mesa[X(+)]
 	ngspice? (
-		sci-electronics/ngspice[shared]
+		>sci-electronics/ngspice-27[shared]
 	)
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index 68c690312a8a..88c18773559e 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/freeglut
 	media-libs/mesa[X(+)]
 	ngspice? (
-		sci-electronics/ngspice[shared]
+		>sci-electronics/ngspice-27[shared]
 	)
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
diff --git a/sci-electronics/kicad/kicad-5.1.5-r1.ebuild b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
similarity index 82%
rename from sci-electronics/kicad/kicad-5.1.5-r1.ebuild
rename to sci-electronics/kicad/kicad-5.1.5-r2.ebuild
index aaf6a6bf350a..26d76cf58871 100644
--- a/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	github? ( net-misc/curl:=[ssl] )
 	ngspice? (
-		sci-electronics/ngspice[shared]
+		>sci-electronics/ngspice-27[shared]
 	)
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
@@ -57,6 +57,9 @@ CHECKREQS_DISK_BUILD="800M"
 PATCHES=(
 	"${FILESDIR}"/"${PN}-5.1.5-help.patch"
 	"${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch"
+	"${FILESDIR}"/"${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}"/"${PN}-algorithm-header.patch"
+	"${FILESDIR}"/"${PN}-metainfo.patch"
 	"${FILESDIR}"/"ldflags.patch"
 )
 
@@ -67,11 +70,22 @@ pkg_setup() {
 	check-reqs_pkg_setup
 }
 
+src_unpack() {
+	default_src_unpack
+	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
+	# avoid QA issue.  This is needed because /usr/share/appdata location is
+	# deprecated, it should not be used anymore by new software.
+	# Appdata/Metainfo files should be installed into /usr/share/metainfo
+	# directory. as per
+	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
+}
+
 src_configure() {
 	xdg_environment_reset
 
 	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
 		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 		-DBUILD_GITHUB_PLUGIN="$(usex github)"
 		-DKICAD_SCRIPTING="$(usex python)"
@@ -84,6 +98,7 @@ src_configure() {
 		-DKICAD_USE_OCC="$(usex occ)"
 		-DKICAD_USE_OCE="$(usex oce)"
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
 	)
 	use python && mycmakeargs+=(
 		-DPYTHON_DEST="$(python_get_sitedir)"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 63faa8e6b980..26624efb09f0 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/pymc3/Manifest b/sci-mathematics/pymc3/Manifest
index 516fc1e3ee69..b8c95da67934 100644
--- a/sci-mathematics/pymc3/Manifest
+++ b/sci-mathematics/pymc3/Manifest
@@ -1,3 +1,3 @@
 DIST pymc3-3.1.tar.gz 34553828 BLAKE2B 73c4d50f7d656322fa1a7384aefa1f46caacccc8055138fefc27a82d765866efb9d4853a842a2df312058c558edd66b37a40295904c86f023f8fec5503877206 SHA512 30799d9c1b670adbcf5cc1463029d71a87c7b917e83b1f6cb453d75553616da7173421e7ae6e31b332c85f8170daea735344ff83ba6605cf3b15cf79c5c4fb97
-EBUILD pymc3-3.1.ebuild 1531 BLAKE2B 8e497bc9fa347d879cd356bad2100fdb60c91c35838d703010f2ddd990bd7a0c773b143fafb3eef1f29b33bc682f1141bcf545c51a4ab57a42a63405d439eaed SHA512 d9f0c88fb2708626e2778c163bf0b31031e219c664356c11478ede36923e8c288af260167fd61711282fe40a70ffa588a84b63002b8207bc0796d5063a741a62
+EBUILD pymc3-3.1-r1.ebuild 1433 BLAKE2B efcce10b67f51d4379a3e15c458513b5c058371c148f4f879a5b2d45c3c6d7a87f5228da33ed5526bc65c270e02f161341ff1a39667a5f07bddf730c691145a7 SHA512 a4dd49af5c79fd3521e24f2750187693f1256d97267eb06803ecdcc83a0ab39eb027460a574fff959cec88e622dba3f682105f5555196d2279aa128fec9571ca
 MISC metadata.xml 740 BLAKE2B 2c56161497137f40e0e25e85299af90c361ddbcaccb4436747ba111e725c9a881fdf88944dd0208909275bf4013b9e1d5983b590ad7f46589f584549288aa02c SHA512 c75ed4b57479fef93c4b667792cb284212f859532697c4d4876e2dc23ab13d2c470143d3236de03e741a0797049a12d3a7e2f0d2ae4f07b2cfb0b7943c78526d
diff --git a/sci-mathematics/pymc3/pymc3-3.1.ebuild b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
similarity index 93%
rename from sci-mathematics/pymc3/pymc3-3.1.ebuild
rename to sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
index 3c95b008123c..b631808b810e 100644
--- a/sci-mathematics/pymc3/pymc3-3.1.ebuild
+++ b/sci-mathematics/pymc3/pymc3-3.1-r1.ebuild
@@ -22,7 +22,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.11[${PYTHON_USEDEP},lapack]
 	>=dev-python/matplotlib-1.5[${PYTHON_USEDEP}]
@@ -30,7 +29,6 @@ RDEPEND="
 	dev-python/numpydoc[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.18[${PYTHON_USEDEP}]
 	>=dev-python/patsy-0.4[${PYTHON_USEDEP}]
-	>=dev-python/recommonmark-0.4[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/theano-0.9[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.8.4[${PYTHON_USEDEP}]
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index e0199dadd995..9e05c62bbb36 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
+DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893 SHA512 a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
 EBUILD z3-4.8.6.ebuild 2335 BLAKE2B e980e31d4d6ab4443b7b385c66aa1a71ab062d4783e1947d1a2d9688986729a19769813e22cb7395d9a8a1a45e1fb898da1a8e6c923c8486aa8dccd601f9874b SHA512 214122932dcbb1cef0e3d3617e37e3057936b28afc7d70fff2fe08bfcaad963516d48f20fe65efaf80729f5ab070b562aa574c163f908c82b620846e5cda7982
-MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
+EBUILD z3-4.8.8.ebuild 2415 BLAKE2B fa4d5fe952685eb5d8d2aa1f679b008e6887c0eaa25ec7101635db290b33ae5c5936216b5cd1ba11cf49006ac1de242a566e7b47923e608dbace24c6c5b85d08 SHA512 b4e757bfdf1a252f0b33f28fb1dd470025966dd16cf77e5925d0e52a30011672475097789d46557fcddce00cf5d308c9f417f6da858c2a66965933547c2d4d75
+MISC metadata.xml 732 BLAKE2B dec39a80325f9dba9e79d65f448d828c3ee19327a1a12505e487a39fd58fb49f47446e439d713a9fa2603bc971f22f4eb8c1a12e93e18281aeba5e183642add8 SHA512 7d081840634a8dc578acc60c4b85ef1a35f025c2ac251d2f7633a807af7395061ef4fb96716e96a96a876ae318b52333dfc0200fa1e72e35889433676a56e58b
diff --git a/sci-mathematics/z3/metadata.xml b/sci-mathematics/z3/metadata.xml
index 15735c68e920..65ab90b88bdf 100644
--- a/sci-mathematics/z3/metadata.xml
+++ b/sci-mathematics/z3/metadata.xml
@@ -15,9 +15,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription lang="en">
-Z3 is a high-performance theorem prover being developed at Microsoft Research.
-  </longdescription>
   <use>
     <flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
diff --git a/sci-mathematics/z3/z3-4.8.8.ebuild b/sci-mathematics/z3/z3-4.8.8.ebuild
new file mode 100644
index 000000000000..949c33e2e2b1
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cmake-utils_src_make test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 17653b51acc2..ea68f0dc54a5 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 9dfc240d4368..7f1eebad353b 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,10 +1,4 @@
 AUX 1080.patch 922 BLAKE2B 59325abb5d2f9d9e501c34b539a98efea521ee38872f1e2d3850442aac82adaea3a3c32e644f3d2982aa9aa86dbdfb5bd1373175a89acffac63d87ac542919a7 SHA512 a94bba2ad992f85db0f7d7d04cef235a79e4600e353897032d78ffc3e1f899bc340a5ad8aa1d8da41f9783b67d912dab8c3cd2f83a605a9e0c0ef51bdb909279
-AUX fm_exp.patch 347 BLAKE2B 230da9c04160d445a3da1c813453a788ad04b1d174c494ab9dd1de628ba3c1bf7f9aeb5070b165ec545a280208f07254afaa4d9120fffff5ee98975233d9fc9e SHA512 d0c8303bfe623fe766a545e1614f7576709381597e56f7c7634e90768376bccb9fbe37d4c0eeb6491c9b45d911a913a37386e0280ec3f05a90388aad7bb23c3e
-AUX gcc-6.patch 397 BLAKE2B 7ef1bf4e884763d84ea661ad09dc1e373db10a177e1bf09f617edfc6bcefef5d494def037ba62a8ea76d83cb2eba172dc0188ba4f0ad1877b7cadd3a91d1f583 SHA512 eebb9041347dbe260be6028d9462183188ce95f3114873b2a776990aa77c71dd4b0ba37d2fe3fbf0b8bff64f85dfafaec93ad7234502791a1048ab6bfd1d06ed
-AUX lammps-python3-r1.patch 544 BLAKE2B dcde498a0d886f941aefef6818429efe2a9d253285239a122b983a5bc6ab7b7c053f3fa78b24b995b21891c190f3c82d7032d07015f9baf3c525320e7421a3c4 SHA512 833ec755ba4dadf072ced646220a7a68147023548da9eeebdd1d4a6c198ee48fed1e60a7fc26de7093b5d9b77a906e162a7ef4f5f929918196943564f69037d5
-AUX lammps-python3-r2.patch 459 BLAKE2B 4371e3dd2f0f07f4be0533df1b107eaa74851eeba5362931034f74696bbed221d776414d150c7cc3517d31193c45854c09899ba78cb96c76f864ed90275240ae SHA512 87e12b5089ca6d75e9ec02b773964fbde0170a56876ae990648362757ff110a817d7a968e9496cd6475faec22a8a6c9d71d3367f564b34bba297b8e8eb0940c7
-AUX lammps-python3.patch 509 BLAKE2B 1c3f0fec8e6ad27c58e70e32f073a9840fc3564b4f92ca27f4b755e7a2c4400a9cd4e8bdff4f7d6eae2316a842995e8fb0bb2d1b79bb70d320a12e471ab7d14f SHA512 e88b7e036c3ea86c032a7e8dde771073c08ed96c0a3da240a824fd7f424553ef4d5db2ba6c4fcfcb9f0ec4550a073e7370a163165352911ee4f1d64f91094056
-AUX python-shebang.patch 393 BLAKE2B 6c0558d2f288d6587724f1b0e7ac38d1c4b29a06f27e27a3d366f960ab18596053f3580d190fbf525eee873ed28118973777988d53a83b46486320903334bf72 SHA512 fd4663ac2ce6949e59509ab03a7eda4471e38350440fe6c64c9fe5321941a5951074578148d0da335292a4e19c6c0b13d3e97c174123eb1d9662bbd63247b5e7
 DIST lammps-patch_12Dec2018.tar.gz 114619148 BLAKE2B 089e23681e46868d09991ca6525850838100aa74ce8796f3af602c76b74fd55618c91610193cfc22c1201e5417f11998f924642961b62824c0271e208f87b286 SHA512 4794fc9bed7974ec33d54b2843f17b29c61a63f91f76c75bec7f00f6f174901f703130564977f8cf7fa9274e7febe096878dc0fa84d65469a5eb8f9b17b58a5e
 DIST lammps-patch_16Mar2018.tar.gz 91908414 BLAKE2B 0d2363ba507765d439988be9f17390889539ecf22132145f5f5f5411c6c3bf097b278b24b005374e4b176efcfbd01edb48b55076bfa41403718ad14d3905e062 SHA512 2847f9ffa368b966cba4792ebe86ea38dfc1e147647e2b738753121a09689901cea7197d3d95fa69cd065cd1d30aa37cbeffcb78b62ec85d88cd9f3ab25e25c2
 DIST lammps-patch_17Jan2018.tar.gz 91721592 BLAKE2B d606a5fd699f3e7aaa777065532f778e96a5b21b88de3fcce69e79c4931fea233ed1ad68f56120865061623c6e33282b9f23f927a7a9820f8f824a241e5cd823 SHA512 533ada073882e9bfc6431db62c4899005983d9efbbb043bcb50b2b0a7af2b11c411bbcc6523b2ffbd5d46531b24573f4b98a07dc757bacbc2f27bb056d7956ff
diff --git a/sci-physics/lammps/files/fm_exp.patch b/sci-physics/lammps/files/fm_exp.patch
deleted file mode 100644
index 3b6bd24028d6..000000000000
--- a/sci-physics/lammps/files/fm_exp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lammps-30Jul16-original/lib/meam/fm_exp.c	2016-04-18 14:00:58.000000000 +0000
-+++ lammps-30Jul16/lib/meam/fm_exp.c	2016-10-06 03:15:55.631053526 +0000
-@@ -112,7 +112,7 @@
-     return epart.f*x;
- }
- 
--double fm_exp_(double *x)
-+extern "C" double fm_exp_(double *x)
- {
- #if defined(__BYTE_ORDER__)
- #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
diff --git a/sci-physics/lammps/files/gcc-6.patch b/sci-physics/lammps/files/gcc-6.patch
deleted file mode 100644
index ca2bcceeedfa..000000000000
--- a/sci-physics/lammps/files/gcc-6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lammps-7Apr16-orig/lib/atc/Vector.h	2014-11-20 11:59:03.000000000 -0700
-+++ lammps-7Apr16/lib/atc/Vector.h	2016-10-13 06:04:44.328977960 -0600
-@@ -119,7 +119,7 @@
- {
-   DenseVector<T> r(v);
-   r*=(1.0/s); // for integer types this may be worthless
--  return ;
-+  return r;
- }
- ///////////////////////////////////////////////////////////////////////////////
- //* Operator for Vector-Vector sum
diff --git a/sci-physics/lammps/files/lammps-python3-r1.patch b/sci-physics/lammps/files/lammps-python3-r1.patch
deleted file mode 100644
index 2dc2bd744fa9..000000000000
--- a/sci-physics/lammps/files/lammps-python3-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lammps-4Sep15-orig/python/lammps.py	2015-09-02 14:41:38.000000000 -0600
-+++ lammps-4Sep15/python/lammps.py	2015-09-08 05:59:16.000000000 -0600
-@@ -33,7 +33,7 @@
-     except:
-       type,value,tb = sys.exc_info()
-       traceback.print_exception(type,value,tb)
--      raise OSError,"Could not load LAMMPS dynamic library from %s" % modpath
-+      raise OSError("Could not load LAMMPS dynamic library from %s" % modpath)
- 
-     # if no ptr provided, create an instance of LAMMPS
-     #   don't know how to pass an MPI communicator from PyPar
diff --git a/sci-physics/lammps/files/lammps-python3-r2.patch b/sci-physics/lammps/files/lammps-python3-r2.patch
deleted file mode 100644
index a447c4b3a303..000000000000
--- a/sci-physics/lammps/files/lammps-python3-r2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lammps-23Mar16/python/lammps.py	(original)
-+++ lammps-23Mar16/python/lammps.py	(refactored)
-@@ -208,7 +208,7 @@
-       result = (c_double*nlocal)()
-       self.lib.lammps_extract_variable.restype = POINTER(c_double)
-       ptr = self.lib.lammps_extract_variable(self.lmp,name,group)
--      for i in xrange(nlocal): result[i] = ptr[i]
-+      for i in range(nlocal): result[i] = ptr[i]
-       self.lib.lammps_free(ptr)
-       return result
-     return None
diff --git a/sci-physics/lammps/files/lammps-python3.patch b/sci-physics/lammps/files/lammps-python3.patch
deleted file mode 100644
index 1937881c9339..000000000000
--- a/sci-physics/lammps/files/lammps-python3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lammps-11Apr15/python/lammps.py	2015-03-13 16:06:20.000000000 -0600
-+++ lammps-11Apr15-new/python/lammps.py	2015-04-13 09:40:43.000000000 -0600
-@@ -28,7 +28,7 @@
-     except:
-       type,value,tb = sys.exc_info()
-       traceback.print_exception(type,value,tb)
--      raise OSError,"Could not load LAMMPS dynamic library"
-+      raise OSError("Could not load LAMMPS dynamic library")
- 
-     # if no ptr provided, create an instance of LAMMPS
-     #   don't know how to pass an MPI communicator from PyPar
diff --git a/sci-physics/lammps/files/python-shebang.patch b/sci-physics/lammps/files/python-shebang.patch
deleted file mode 100644
index 7dd45797d4ad..000000000000
--- a/sci-physics/lammps/files/python-shebang.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- lammps-25Mar15/python/lammps.py	2015-03-13 16:06:20.000000000 -0600
-+++ lammps-25Mar15-new/python/lammps.py	2015-04-10 15:31:14.000000000 -0600
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # ----------------------------------------------------------------------
- #   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
- #   http://lammps.sandia.gov, Sandia National Laboratories
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6f5a676c5231..b9419267ec9a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 8e8701bb415e..c15456e84a7a 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,4 @@
 AUX moreutils-0.63-respect-env.patch 1160 BLAKE2B 3d62cf5d86e22962093c1e7f315233d4da3643a809ff37af637bfc327001702f6e17e741e269c2c49b99ece922e46e435469c45f744bd67f07033018b43f9c83 SHA512 cfe8696cfd5502012dc500d44c632bd7cb143902c29b2a5bb545e309762d63a5bb41daed04a289d2b6b50be3c16256f897260471a38ac4adfd6a0b856ade1444
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
-EBUILD moreutils-0.63.ebuild 1496 BLAKE2B 13ccbdfa8132eb2bf49029f3139bdac6b7bd76f230346bc5cb467dd1f30d6ca99a7b2e0d6fc2bb5771c1acb8e85f962fed8c965ab5f0d01495fb55ed93d0e622 SHA512 fc4980ee4fe72d3ad2709855b22df4dcff7061176c2ff6d3b74e371355ba3a7420593fc8650a862055360b09b1fb4fa5f65d780a029d440a284922a3397589fc
+EBUILD moreutils-0.63.ebuild 1495 BLAKE2B ec8305ce981fefadd7dd18773bbf6f6ef45f478bd88f6c1cef777e51c7d214e05fd80b68c95125c62833c17adeae10235adecd3ab0c586bd7825b418d79970fb SHA512 d4242878b139be134789bd5644bc97c46bf9a61a45186f1ba04e2c1ab8a3b627a0aea42797e695199d71e5aa8a151df75880c27a4852ad7559ba4406e2df0a67
 MISC metadata.xml 427 BLAKE2B 311360aef2c49094822392ff35feb4bcbf03f16a909e6047a89c6280094d51b2347817dcd6938df998909101d53b8a14ee847f0eea5568bae6326ff01ebe2fee SHA512 d535b7f684ce284bf60ff162383773df08a753e9b2e80bcfe271cf39f0765719f8a00cffb46fed0c948e971875286bc9c3ca5972debfc3ed3653fcc33ac6a2a0
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
index 3717d9f1f27b..4cb0b5d1cf8f 100644
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index f774928ac2c0..502def9046c1 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 95ecf23c40e4..4aebb24a3bb8 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,6 +1,9 @@
 DIST keystone-16.0.0.tar.gz 1671648 BLAKE2B 172ce385a009c4c5fb83fa6fb7fa06d5be98e72064e21d4b5a62bb61bcbdfdce3702847820b71837ff54077b7b454fc0d2b95eabcbb2150f2919c7f9d3fc7299 SHA512 af4c977c4ef0fdcc89e94929c026daa1175caef96332f9dcb71a559659d8361467b2a40174847a8e7d7b70e1a151002cfe846a1be5fc7c5bfd1a8aeae3975397
+DIST keystone-16.0.1.tar.gz 1683325 BLAKE2B 6f22773592a1c843e82bcded230d2606b7fe8e540d50ccdbd85f53d4e5fda81023e85d04c258bc3741ecd7e4f8855299ab1828c8864862715ffd32629b877245 SHA512 060725244a181a98a3011ef7ae648b67054e64216fc62870b4190fd8475c8c36de01ae6428d1d4fac4bbdb405097aab1a9fe11daa65d4624dc613821cfeee004
 DIST keystone.conf.sample-16.0.0 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
+DIST keystone.conf.sample-16.0.1 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 DIST keystone.conf.sample-2019.2.9999 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 EBUILD keystone-16.0.0.ebuild 5764 BLAKE2B ceb758ad21f80fdfc8f29f854a2837a9bdbdb4236cf46889363f89be419bd41fc5a3a3852837d52c7112f63ea830291239bef5e5d0a3444bfa92ac9d3be19b43 SHA512 f08c5fa1c5a655168bae30ca9169471515942691a84348c3ec51c77b41128625bcdab1ea7ed22659681f3c39dce5747f337226fd2066a238abae9ca449832131
+EBUILD keystone-16.0.1.ebuild 5698 BLAKE2B feb7ca10408e2eed5d3cb7a7e701dba64a959d49decc3c3eec540f1b5715a8d2a99017ce49d6c5dd68d20a0f0c808378959921788e71800bcfb10359224159e4 SHA512 994973fa68b25c3d5ffe15dbebdde685306b0cd52b2af0832fe24f0bda0aa6f3a0da0a95969be119934c1190cce4985daa7811fddd1a3a3a056efe04d592fa21
 EBUILD keystone-2019.2.9999.ebuild 5698 BLAKE2B feb7ca10408e2eed5d3cb7a7e701dba64a959d49decc3c3eec540f1b5715a8d2a99017ce49d6c5dd68d20a0f0c808378959921788e71800bcfb10359224159e4 SHA512 994973fa68b25c3d5ffe15dbebdde685306b0cd52b2af0832fe24f0bda0aa6f3a0da0a95969be119934c1190cce4985daa7811fddd1a3a3a056efe04d592fa21
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-16.0.1.ebuild b/sys-auth/keystone/keystone-16.0.1.ebuild
new file mode 100644
index 000000000000..f1cdd22c765a
--- /dev/null
+++ b/sys-auth/keystone/keystone-16.0.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+	acct-user/keystone
+	acct-group/keystone"
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+#	doins etc/policy.v3cloudsample.json
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2b0c2fdbf0d3..90d5526f9275 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 2aa8d83c3c54..6a93edc1e79d 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -3,12 +3,14 @@ AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c73
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 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
 EBUILD kube-apiserver-1.15.10.ebuild 1285 BLAKE2B 0c7156f9f7a749245968622fa4658a42d9efc015264f7928fa9ca37fb4afc24ed8e8ae700de243280593a92513b6e12db0010c27bd61a679c929a132e13c2bd5 SHA512 bf596f678053dc89f968bd44a149c214d9e177a32a8fe8f4726494fbe15a5e4a3bc111de4b85e2b23a3a0ffa1d08a36b52e7a32151c4562fb94a11224bf7385a
 EBUILD kube-apiserver-1.15.11.ebuild 1285 BLAKE2B 0c7156f9f7a749245968622fa4658a42d9efc015264f7928fa9ca37fb4afc24ed8e8ae700de243280593a92513b6e12db0010c27bd61a679c929a132e13c2bd5 SHA512 bf596f678053dc89f968bd44a149c214d9e177a32a8fe8f4726494fbe15a5e4a3bc111de4b85e2b23a3a0ffa1d08a36b52e7a32151c4562fb94a11224bf7385a
+EBUILD kube-apiserver-1.15.12.ebuild 1285 BLAKE2B 0c7156f9f7a749245968622fa4658a42d9efc015264f7928fa9ca37fb4afc24ed8e8ae700de243280593a92513b6e12db0010c27bd61a679c929a132e13c2bd5 SHA512 bf596f678053dc89f968bd44a149c214d9e177a32a8fe8f4726494fbe15a5e4a3bc111de4b85e2b23a3a0ffa1d08a36b52e7a32151c4562fb94a11224bf7385a
 EBUILD kube-apiserver-1.16.7.ebuild 1285 BLAKE2B a59f7298262739cccca6a7645ba1cd27124ae9046f04591b2f5b11d8041620758211898827311579862528eea0764a53a4d8738d21d6d76613bbbcebfc46d794 SHA512 2e5acde6f1629e20cb46832ddf2531dfe4b9211ea19dc1ea2e8cde6e46fcac3aa6b6a76ad3f2358d1595adc47b7b749b9d94af8dea3750ffccaa3e200419b640
 EBUILD kube-apiserver-1.16.8.ebuild 1285 BLAKE2B a59f7298262739cccca6a7645ba1cd27124ae9046f04591b2f5b11d8041620758211898827311579862528eea0764a53a4d8738d21d6d76613bbbcebfc46d794 SHA512 2e5acde6f1629e20cb46832ddf2531dfe4b9211ea19dc1ea2e8cde6e46fcac3aa6b6a76ad3f2358d1595adc47b7b749b9d94af8dea3750ffccaa3e200419b640
 EBUILD kube-apiserver-1.17.3.ebuild 1126 BLAKE2B 671e10c4dd12456049f4726ceadc7252ff433408c1360cd8a82413bd828902d45b9e6a80ab4afac5b4b83c6c3c349f2e7bad18fce578184dde7fc6086915b616 SHA512 ab0bf7873d6ed45cdeb8f482d463ee93c7ecf0b4f6a5245b37ecdd2c4f7a0f9c4c85f66e0fb83b12e8debc59d92e337b8289cf953dec9fdbd0fc7cf2b254e440
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild
new file mode 100644
index 000000000000..fc7b99f1b89b
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.12.ebuild
@@ -0,0 +1,47 @@
+# 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-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index def405c21d51..9bb9bfd1f503 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,12 +3,14 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 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
 EBUILD kube-controller-manager-1.15.10.ebuild 1311 BLAKE2B 110f383313870a7be68474bf227948e9d974051011681427d7959e35d67fa4bccb50cce1375db7dbb64e5466dcf50fecf74225686100515989fbb01d6ab1bf73 SHA512 ca002dd605ac00c82357fe74621c988ec4eb1befabf0d29b159e2a7e64ae8d03738ad8577728a9c43530f1bc2dadbf50e689c19e0d400cd3bf8f3e772115f29d
 EBUILD kube-controller-manager-1.15.11.ebuild 1311 BLAKE2B 110f383313870a7be68474bf227948e9d974051011681427d7959e35d67fa4bccb50cce1375db7dbb64e5466dcf50fecf74225686100515989fbb01d6ab1bf73 SHA512 ca002dd605ac00c82357fe74621c988ec4eb1befabf0d29b159e2a7e64ae8d03738ad8577728a9c43530f1bc2dadbf50e689c19e0d400cd3bf8f3e772115f29d
+EBUILD kube-controller-manager-1.15.12.ebuild 1311 BLAKE2B 110f383313870a7be68474bf227948e9d974051011681427d7959e35d67fa4bccb50cce1375db7dbb64e5466dcf50fecf74225686100515989fbb01d6ab1bf73 SHA512 ca002dd605ac00c82357fe74621c988ec4eb1befabf0d29b159e2a7e64ae8d03738ad8577728a9c43530f1bc2dadbf50e689c19e0d400cd3bf8f3e772115f29d
 EBUILD kube-controller-manager-1.16.7.ebuild 1311 BLAKE2B 519c5d1b915a39db5b5ba411f3877be52c33589cd7da802a33f1e8b58a211611ee81ba47d623c02b7f3c1ca4c810919106ab8b2ff836f2040e5c4ff0c602e197 SHA512 98bbe8279b0b7aaaad65608b166ddeaea7f9f5ad11a8abc2a426631297d615ce769efde59a10beaebd6ba974b9fcce708b9b7baf2616935b70827f9ee94e5a23
 EBUILD kube-controller-manager-1.16.8.ebuild 1311 BLAKE2B 519c5d1b915a39db5b5ba411f3877be52c33589cd7da802a33f1e8b58a211611ee81ba47d623c02b7f3c1ca4c810919106ab8b2ff836f2040e5c4ff0c602e197 SHA512 98bbe8279b0b7aaaad65608b166ddeaea7f9f5ad11a8abc2a426631297d615ce769efde59a10beaebd6ba974b9fcce708b9b7baf2616935b70827f9ee94e5a23
 EBUILD kube-controller-manager-1.17.3.ebuild 1153 BLAKE2B 2ad827e85b8bfbd74c278bece29f89165c356d6b2973200324510254d83841d8d872e441fd59fe8b534c4704057df890899f02de5abe2dacde24532c2339720e SHA512 8df3a7bb651c184a45e9595c1c80156e387b49b7c0b66313b96b67421345e53faee9eacfaa48dfb4136a2caa063378bd24cb6e83b6cd84d20ad7569a15d53c5b
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
new file mode 100644
index 000000000000..e2bb284d01ae
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.12.ebuild
@@ -0,0 +1,47 @@
+# 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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 166191e81037..5a1d98573880 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,12 +3,14 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 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
 EBUILD kube-proxy-1.15.10.ebuild 1194 BLAKE2B eee9417cd4089a7ddd1a4ca37f62b0cbc15ec3c978c884a2a296f7a2976244f667b9b4999426cb981d3bc247a3c6a449a2f1dece95c4b060ffaf9979915d853a SHA512 e2090b86dc47563d152d15e2b9b42b096981580b3fee7627698f81e88d5513721534b36ab09aaae88f68c9a928b1af09e57b2de59312686ee5bda85937641814
 EBUILD kube-proxy-1.15.11.ebuild 1194 BLAKE2B eee9417cd4089a7ddd1a4ca37f62b0cbc15ec3c978c884a2a296f7a2976244f667b9b4999426cb981d3bc247a3c6a449a2f1dece95c4b060ffaf9979915d853a SHA512 e2090b86dc47563d152d15e2b9b42b096981580b3fee7627698f81e88d5513721534b36ab09aaae88f68c9a928b1af09e57b2de59312686ee5bda85937641814
+EBUILD kube-proxy-1.15.12.ebuild 1194 BLAKE2B eee9417cd4089a7ddd1a4ca37f62b0cbc15ec3c978c884a2a296f7a2976244f667b9b4999426cb981d3bc247a3c6a449a2f1dece95c4b060ffaf9979915d853a SHA512 e2090b86dc47563d152d15e2b9b42b096981580b3fee7627698f81e88d5513721534b36ab09aaae88f68c9a928b1af09e57b2de59312686ee5bda85937641814
 EBUILD kube-proxy-1.16.7.ebuild 1194 BLAKE2B a261c9e446644f53d98b5c445a55964a38c8cc24fc6ec0548435c5204a09d910b78290d17cb44ad192ca12e2402c7cc7eb93cc466e109e71757425e15808dbe6 SHA512 f57448691af8faf545bef57f77fc79ec2241c4f3c25f870367e48a4e59cff816ade69abf3372af6d10510dac10f0f27654c0d4bae6bfe8a17d93be11cd4a2f9c
 EBUILD kube-proxy-1.16.8.ebuild 1194 BLAKE2B a261c9e446644f53d98b5c445a55964a38c8cc24fc6ec0548435c5204a09d910b78290d17cb44ad192ca12e2402c7cc7eb93cc466e109e71757425e15808dbe6 SHA512 f57448691af8faf545bef57f77fc79ec2241c4f3c25f870367e48a4e59cff816ade69abf3372af6d10510dac10f0f27654c0d4bae6bfe8a17d93be11cd4a2f9c
 EBUILD kube-proxy-1.17.3.ebuild 1035 BLAKE2B 68fa466d990f76cddfa22c6bdc7023ddb471c5d0ad074422b4edfd3812c110d801e8171c3d4964430fd1f9189c2d67ca017425a1283b229b3fa7c13dbdee794b SHA512 c22fbfa6ea34a7d292f2eed5b9d1d674be6361f16d80b71d71d8f3a1ae8d883b843814bbfa7b427387cc0708fb0924cad9e6097f2bf0437a06ca48efdf0a4f97
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild
new file mode 100644
index 000000000000..03c146243909
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.15.12.ebuild
@@ -0,0 +1,44 @@
+# 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-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 667b7e7a944d..2bbecebd06d4 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,12 +3,14 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 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
 EBUILD kube-scheduler-1.15.10.ebuild 1285 BLAKE2B 8fb33630b5406b0c6820544b1701ed4e955ebc50eba52ecdff193b18a9ed29ca6949c241dfe1b3f477b288b2ebc274cde6264f4faf7f46adf346e4d8697b3f4a SHA512 40cd3afb9417158ae90f6dd0cea5354baff793effce060c0cb56d2b8486bc191291e7da03b07403db798f0f4e702289ee47ff96990004904fff165a5126073bb
 EBUILD kube-scheduler-1.15.11.ebuild 1285 BLAKE2B 8fb33630b5406b0c6820544b1701ed4e955ebc50eba52ecdff193b18a9ed29ca6949c241dfe1b3f477b288b2ebc274cde6264f4faf7f46adf346e4d8697b3f4a SHA512 40cd3afb9417158ae90f6dd0cea5354baff793effce060c0cb56d2b8486bc191291e7da03b07403db798f0f4e702289ee47ff96990004904fff165a5126073bb
+EBUILD kube-scheduler-1.15.12.ebuild 1285 BLAKE2B 8fb33630b5406b0c6820544b1701ed4e955ebc50eba52ecdff193b18a9ed29ca6949c241dfe1b3f477b288b2ebc274cde6264f4faf7f46adf346e4d8697b3f4a SHA512 40cd3afb9417158ae90f6dd0cea5354baff793effce060c0cb56d2b8486bc191291e7da03b07403db798f0f4e702289ee47ff96990004904fff165a5126073bb
 EBUILD kube-scheduler-1.16.7.ebuild 1285 BLAKE2B dfa432448d8432a5a85a087b77225b321ecab0eddb10d0035fb410e09c2808a8a508134e7ae2d0f3f31197fcad755aebdda6a70365ec8986e935ec6538148e91 SHA512 cd6519a51af003249f2df05fcd8d641234f26fba4f79e62337730af0f8230ba688818204a62f81163172bdadb9f53a72339390073cf989f2059ad2111cfb0a34
 EBUILD kube-scheduler-1.16.8.ebuild 1285 BLAKE2B dfa432448d8432a5a85a087b77225b321ecab0eddb10d0035fb410e09c2808a8a508134e7ae2d0f3f31197fcad755aebdda6a70365ec8986e935ec6538148e91 SHA512 cd6519a51af003249f2df05fcd8d641234f26fba4f79e62337730af0f8230ba688818204a62f81163172bdadb9f53a72339390073cf989f2059ad2111cfb0a34
 EBUILD kube-scheduler-1.17.3.ebuild 1126 BLAKE2B 0d50f6da953e1a038d716b0b87284dd875686f1494a2dead30938b4549b37524ac027cf8a600ffac2c5965da13a9d2536f3348024d3ab8459ed83252c7d036fd SHA512 79eb3308402764b2ea332a67fbf3a2933675f3d9d9ce7fa3dca702366cc09f32d5b462b2361649e9d4f3fedb20d89a081eec1881fb9103afc22971b87611175f
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild
new file mode 100644
index 000000000000..d11afdbbbedd
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.12.ebuild
@@ -0,0 +1,47 @@
+# 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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 523f0e36c2d6..0af7db046bb2 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,11 +1,13 @@
 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
 EBUILD kubeadm-1.15.10.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
 EBUILD kubeadm-1.15.11.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
+EBUILD kubeadm-1.15.12.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
 EBUILD kubeadm-1.16.7.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
 EBUILD kubeadm-1.16.8.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
 EBUILD kubeadm-1.17.3.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild
new file mode 100644
index 000000000000..6f09247989fc
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.15.12.ebuild
@@ -0,0 +1,47 @@
+# 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/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e077d984a80a..8653082a9887 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,11 +1,13 @@
 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
 EBUILD kubectl-1.15.10.ebuild 1287 BLAKE2B c1039bcd37cd643f098c60e5e8a5cc5305daac8c22bde30f65a9faadf05657ef6ae01e8d87f8d2c0ccb47ef65d0a3b1ae2a4b94aa2b7c977bfd04fd4f9a98c00 SHA512 bbe2c3260b1a0435811b23a52b697853f08495605ae0e0bf8539e93d60b6a562005b64360d5640df3098986912b0dc805989a9f582fb4abfd3de6ed40ac5017f
 EBUILD kubectl-1.15.11.ebuild 1286 BLAKE2B 6cf861b209e0df7c8c2ff62ff4698d0f74f125ea30d6daa2a01444536c2a646e26cf2a6d359aa6e8a7a797c687c2a38db3df2599d91f08f058d19c1710f7bc68 SHA512 123f42dd0d81854466880507079e0aebab63507907762b5e86a142251382bc0be44cd595bd2c85a1130027f6dbb9ab71011040d4dc1734540e9ba9a2510b80cd
+EBUILD kubectl-1.15.12.ebuild 1287 BLAKE2B c1039bcd37cd643f098c60e5e8a5cc5305daac8c22bde30f65a9faadf05657ef6ae01e8d87f8d2c0ccb47ef65d0a3b1ae2a4b94aa2b7c977bfd04fd4f9a98c00 SHA512 bbe2c3260b1a0435811b23a52b697853f08495605ae0e0bf8539e93d60b6a562005b64360d5640df3098986912b0dc805989a9f582fb4abfd3de6ed40ac5017f
 EBUILD kubectl-1.16.7.ebuild 1287 BLAKE2B eafef6161de411917449cf56a9262ff03a11243de64ac3b00af9a3df6d2249f3e21841369177783de0ceeb79a4e73afdb757afa361833bbefb786670d952d10e SHA512 3442cceb953bb2221c990feb3365001fda8c9c64636e93a7580d35ebe6d080fcdfbde414db46f388723dbd87b2698b093220184c808b8de9505b655f1145ed47
 EBUILD kubectl-1.16.8.ebuild 1287 BLAKE2B eafef6161de411917449cf56a9262ff03a11243de64ac3b00af9a3df6d2249f3e21841369177783de0ceeb79a4e73afdb757afa361833bbefb786670d952d10e SHA512 3442cceb953bb2221c990feb3365001fda8c9c64636e93a7580d35ebe6d080fcdfbde414db46f388723dbd87b2698b093220184c808b8de9505b655f1145ed47
 EBUILD kubectl-1.17.3.ebuild 1051 BLAKE2B a0bcd5e270a4b55cd36974b519cf48cfd4bf717fbd2101054ae5b39479a8ea8351754a3f2819f685fb1114c70f5196b152aea69ff08ca893a335cbce186512c6 SHA512 32322c110477b4b44d066b0c59d12991597b6d772d9f79b0ce10516c8563c3edc3e55b61f27bd5e5ed7567837615eb7a5b9b766786291683a4d26e2a4f4d385e
diff --git a/sys-cluster/kubectl/kubectl-1.15.12.ebuild b/sys-cluster/kubectl/kubectl-1.15.12.ebuild
new file mode 100644
index 000000000000..021b5398348a
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.15.12.ebuild
@@ -0,0 +1,48 @@
+# 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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 3781bf5f031d..5a3576c6672d 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -5,12 +5,14 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 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
 EBUILD kubelet-1.15.10.ebuild 1371 BLAKE2B 43bdcb3a9150f9b861ee4fa2021364d45cff93457662de3d43dce3470b907c72c723a2c49f552f63e0754f37dfc497f7a7f2db040e89899afbc9069348e3373b SHA512 0dfc25ce173f1c4d0084e2fd924c8419519c8e6e3c9ad655e361f8c935c7e825db372f767d0831f48399550683c0ffb1328b7359ee7b466f173a45ce8ed050da
 EBUILD kubelet-1.15.11.ebuild 1371 BLAKE2B 43bdcb3a9150f9b861ee4fa2021364d45cff93457662de3d43dce3470b907c72c723a2c49f552f63e0754f37dfc497f7a7f2db040e89899afbc9069348e3373b SHA512 0dfc25ce173f1c4d0084e2fd924c8419519c8e6e3c9ad655e361f8c935c7e825db372f767d0831f48399550683c0ffb1328b7359ee7b466f173a45ce8ed050da
+EBUILD kubelet-1.15.12.ebuild 1371 BLAKE2B 43bdcb3a9150f9b861ee4fa2021364d45cff93457662de3d43dce3470b907c72c723a2c49f552f63e0754f37dfc497f7a7f2db040e89899afbc9069348e3373b SHA512 0dfc25ce173f1c4d0084e2fd924c8419519c8e6e3c9ad655e361f8c935c7e825db372f767d0831f48399550683c0ffb1328b7359ee7b466f173a45ce8ed050da
 EBUILD kubelet-1.16.7.ebuild 1371 BLAKE2B 56677b88b0ce37209a05f906cfa35cbe2d605cba25eb1f3d5957cb65c87654eb8545d53b1e055b02508d997d08a844090560df80ed675b85d15143cb3b325ee4 SHA512 a1571faf59947595508944ab42fa703e8628db52108211ecd1990633238d00987b78d684aa42dcfc8dc579c8fa6432e66aa5a2b254c0c11a310b5bd6cf5de2bf
 EBUILD kubelet-1.16.8.ebuild 1371 BLAKE2B 56677b88b0ce37209a05f906cfa35cbe2d605cba25eb1f3d5957cb65c87654eb8545d53b1e055b02508d997d08a844090560df80ed675b85d15143cb3b325ee4 SHA512 a1571faf59947595508944ab42fa703e8628db52108211ecd1990633238d00987b78d684aa42dcfc8dc579c8fa6432e66aa5a2b254c0c11a310b5bd6cf5de2bf
 EBUILD kubelet-1.17.3.ebuild 1215 BLAKE2B aaa430e041597b155183233742531db60fccc16d479e421c7d8a0e946294ffc27422566fa686b3dd1a2902b34568709a06e1b9cbc4981cdf793388008f20d2b5 SHA512 f62b07ae957ba610564284b17ef694c4555d8fdd5f62267d34f76319ccbb3036653e1d45f3b7f07c972a08ed2751dada1748c3ebe25ce4321ebcdf00df306637
diff --git a/sys-cluster/kubelet/kubelet-1.15.12.ebuild b/sys-cluster/kubelet/kubelet-1.15.12.ebuild
new file mode 100644
index 000000000000..82bd9f75ce32
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.15.12.ebuild
@@ -0,0 +1,47 @@
+# 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/minikube/Manifest b/sys-cluster/minikube/Manifest
index 5f0d9c2b3829..fd283be97904 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,3 +1,833 @@
+DIST bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod 42 BLAKE2B ebde002e2c03188c594fa3cdfc530a5caef34296e7c88e1da18770407c01d8ea2bb4259f7a4a493526abc23bb30d0773935d97c132c0544c9b6c6562e0f6ba33 SHA512 76e5e25a5eef22d4af4425416b389bc878264d7be9ba920d1bc05831e30b322f74fafe29d892982d71897d5b6b006b0711597bf63e1c1003525a7dd00151664a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip 2156000 BLAKE2B b637b0c50932848e72fca02c604a1cca227e92e5a9c706bed9a1f6a1e561f6f02f9f03ea9a420c12fb5e4b4a635af53f5c68ae9bebca367756fcb645816aadd2 SHA512 c6a5042af61a2617139c9081066086e9f94e49bf083d29a8c8ddca31c2c0d3124a937688571fbde5998c47d0dd9ff44692643117a45875fabc4943d5658f044b
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv38.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod 57 BLAKE2B 943afb01beaa46a8b9f7b3ec18cf3e497376cbb1fa0a2d1b259a6bc127a85373ad15725efdfc27982798b597c57e870fcf7c192ce492ccebccecad1c04ee819e SHA512 785331243801e29ecc1ee2f3c28d665eb5faaca6e734468f378f26626ebd93d4c2a4768a7056982e18d650a108d7afd5b82f13a68263c9b18a95a79601248ec8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod 109 BLAKE2B faf0cee9d111fe3b2cc1b152bc70ae800cc1c562680b054b5d8ac93706fc0e3ef7db3779584838cbd37d6ae65154fb7bccbd1d9bfd6465f7a08be0b28700aa61 SHA512 1f82cdcde2070ecdfb57ba52deca35fe758ef4c6c48c924d3590fe036d99a228dc92d736e6fc58f272b88688c817f7763d70c47a223c6be69d7be288932f98b0
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20190822182118-27a4ced34534.mod 57 BLAKE2B a0d84b0cc90e9f25c874616b10259ebe2320de0e60218b5d8323194a7b38615a51a4ce411aa729a5ff155fb6760d8d146938475de889ef285962394753fa0495 SHA512 ede56bd33655b3781f50eb5e4d0749f86b22004655d46a768edc01adef2bd164159407a419c6caba03d7b62b6c60860d8bfe289c1537e6b8c3cdb2a1fb108518
+DIST github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod 37 BLAKE2B f98697a68d300fd35828d622dbb0955afe6d31b3748ba4722e767371b949d98411597e314de6c1858c439505a52f138b9d0f3b5478b5f49f6318b9d9e934eb96 SHA512 0ecd81386269fc2f546e49a9479bbb440229aa2b5112abc52398d8d8770173602c6aeaf4a5f4d487eb2dd74a1b8cbfff071f2d86a23956a2ecb8ae331ed3a494
+DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
+DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip 5595 BLAKE2B 72d6d4e22f8aae9443e52fea0b8b01f704c7d58812c3a52ec4cccb2848f360f995e72b29fb393c333abe92e571e0b2e32a7e328e46e91d1a490b97d4d9ec93fc SHA512 258e6875c1a5c8b700cbb95bea37af6886766cc30b70aa5fd78cb18a92bbbf073ee918bac7699e0bb86c6cdbd4b25f5ba4aff8c95087ad845f8efc84f715c8d3
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip 101282 BLAKE2B 6f158a6a4244c73e1472fd37278fb4bf29edde45361462e069e5c08a116e22b67b520e8a48ff38f286888b4debe179c9b7cef9b589152914b9faf52ca5cf5948 SHA512 ecd8c8fb335e62744eb7ceebbf6ab9517b605032b1b103e7b2fb4d2ea617980ce17b30215b5a42d893dfa1381049bdf2f6d0e0ac23e3b8cdd974278f1984c4e3
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.zip 153532 BLAKE2B 513f9b37625299abc2dc472849cc384da7d8187911d29504420af9b3bcd57635d9c8acfb7ae49851d5dfe70dc31af0502966545ad7368a0aa6364a441f28bf91 SHA512 2d6395c18692b125fa86153c9425feaf4f82ea70499925d0d55834c5b272eb3cb0e1465c5ea0d355a5ec061504bea40a1dbc0f5fd150caa141da06794cf97113
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip 162259 BLAKE2B 71daa9e2a01282e0f29e7f47081f8e5cebb59a31837b2e70b2b52d1ab371b351f6f00a8a0cdf33efaf0529f6ea5e0230ef9a35209dcd7600ad1204cadefa53a2 SHA512 31cef74693dcc7ff3e5e3542654b4174eb8ce7fd3a8a763df52414c99e01679404f2a5e6a1ab9cdbfed958b588e6584feeb8676ef9e149c4d24ae095dd654b64
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.0.0-20190417211021-672e52e9209d.zip 500214 BLAKE2B f8701e7c013a8ca870e2f632d7849ba175a686eb57b579ac43bca34816ea4b98f2c8303918190210f93581da8319ab0dd2ced02b03c76f84b7adf3736e76a23d SHA512 62edb4ecd124f40cd0a78d5accf225fc5fd02b893933cfbf56dae648a8c4b75b26a44887e0f3fcf0db17bf1e9711673372d0dd208cdfc20c01d881aecff2cc69
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod 39 BLAKE2B 8a682140a1d07e82263b0e833426a913fe653381cda13a51ae57546b3364268706318eac76964341746db81863adf5d617ae6f35c5f99975b7678760e1ef98ea SHA512 d513ea6695c5f40b36e8f861d4004e3c8d222dd6568ab60b836dc80608e7e58cfb08e76718a706ad6064da16e3d0d75bb90cc5a33b4ba3a1e0b1db8e6eda7eb7
+DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod 181 BLAKE2B 782362abfcc93dd6f0f126f984278c01ecaa0705d17aeab67fc8a20148a3dde607364b8e3ce2d9b1cfe06f12ce9a6496e1b755d47a407f8990c97a7229480044 SHA512 687061c188f7641eb6d6e88d6aaaee50ed03debe5b8a15fc4e62ae9c25fc00ad449c5d4f6b35d12172cff7296b9e5ccab21cf36258ac9975d10540f2a2a7188d
+DIST github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.mod 53 BLAKE2B 16141257becbde52a173193d76ed39a6884403f22e6a5172744605069bb7a4f24991a6de45e9f2b196e69b269d566fb9a0408ad3a6ba0768063714984a325469 SHA512 7e3e4adf03f80f8c12345ae557443343db733798e0b243ee7a0ce1d5041ad076211ddeca108d921666e51b200a5873be97ee125880eb8aa58d7bed8139e32bc4
+DIST github.com%2F!parallels%2Fdocker-machine-parallels%2F@v%2Fv1.3.0.zip 22222 BLAKE2B 4aa07eef812d34040209730de50c5aabc62cdd3535ba07a47f3b82713ca1a633458b0f76c55a0807f1e6ca7b499c76f1b1ba89a4a5c5b5ae64129fdfdca2a5df SHA512 9f3b95758a66e8ac580bb269ea23f2fd97d1e29dcb288615da9e06a906c088f29f1a2152d2294291722416cd6010531c92e901d208208ed34d3e6e5c57878464
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip 15402 BLAKE2B efbf0c8a3f7e771b5a90ff620bfd513d476e21a672e3f7446202861121dcea08fa95d33b0438b6f1882273630e3cfe756c5934a14a1ab6b2676b117273616097 SHA512 4c39d0907455b1c60e539e8497477e676bf7656c3b30996d55104d6129ebaa02079e5d7d27856352446ec2570c54f0d945be83e2a3445a025c85d12834120ea6
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
+DIST github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod 31 BLAKE2B 012006f0261236f5728b4c28b3f8aa7e4d0bf60599990328b81e9db5f11ed24fd8d82c3b2cf3c72f35bac3f31dd0f41dd4768b27d379a67346d968b32e814c75 SHA512 68c463f83b740db632f4e26bee20bfa047d1c4b3ca49dabc2dbd0d684f82bab86fc7368eed0abcaf970d1d46f86b22fe063c97dc563bc12e96656df79fdeaf17
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
+DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod 35 BLAKE2B 7b5030936400bbff37dc3e2c1d6b7224df6d5f5f97a2e22fd1dc08f3d6ef08894eec30004589dbe81e56a9e71b3ca391e088996a84c98ddabc4d934db7c9fa22 SHA512 e6d91e44ed614c66a668e8423e7657d0696cdd5c6fc0fc4d6ecf741849f1e4891e47262376d4787c967c88c907c5bc668d437d613afaf628fcbbcb352f5d2033
+DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip 8064 BLAKE2B 3fb2dca3bf31d7c8e0bfa67193ca30e7ed76e270fc6ee5e1f1acadaf5be7047dc63afed2f4e55a16d3a641ebbcb8111a6a580b91964081b3e3621e8d62d70f9d SHA512 0a6ea5758fd0d42e2ce8366405eb0ed42da5737c830b36a9cc24cf99541d7d7760a2ee868c99901fb9a103f8113183771f0dbe139deac3667222692c4d025eb9
+DIST github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.mod 867 BLAKE2B d0efbc99d605ba60f89c4a2eb7cdf943b8f4da5f0d8e09e45f8e58ea0f492e47308c7e17ac090291ab673f5f32c1f281527d370da55571ea06bf1cb17b6c87c7 SHA512 23b1e033f75e68d59e43f0b1f0f0692f0ad15c7ba8d25326f2805eaf4af5e2a841550007dffba81cfcd8f1a9754fb08b5fec407384b7adb06d62f1321340f555
+DIST github.com%2Fafbjorklund%2Fgo-getter%2F@v%2Fv1.4.1-0.20190910175809-eb9f6c26742c.zip 145250 BLAKE2B 24c4146ac0f79b2cbc354b3d04fca45baaa4c72b6cc6eeb237f7204040fd3c7e06b19aa93b2ddb5119c75459515759ddce2a8df939431d80848c75dbdbd92af7 SHA512 3adde4f3777fe029dae5f497d7b5eeb8cd78fba6b88d0bdbdaafbf795f47c01dba4af2e1a93c84de3bb2d6cdd0abf982cbaa7ce11445620fa4464d00a159ed54
+DIST github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod 39 BLAKE2B fb2e961ec1914554769b3294f08059e7d8d934938062fed87c404166ce6128f35bd8ab14243fe5e5923e20bf17e0d97937c94f699bf6b5a7839d23bd1d3da7d5 SHA512 2687e2246613ee595f475b33c7bb216a7d8776e415196e4a271e4725a2331e661f2d3128d23f0102f5dbcf2b76f5780e02d673b6336db186932bcfcad35380cc
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 66023 BLAKE2B c023de8e6a5f0b13a7ad1484f21f04643782d802becae77f247709f0c16ab8aff7caf748736561138448efe1cd52c0ac1903b22b92ec56efe817935ccd45ff22 SHA512 356c87eec65f0dc8a680b7a19e888d87fb8c808ec675501df635560fd5d3b57da36ecc2cd9eeb4a5e454c5564d4cf1a062b47b7a050e116b57c87afbe020eb53
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 5176 BLAKE2B 58fdc8010b4ee8363336ef720c8ef2d126c2b7dd79357ca4f99a1094957965544430420f6ae4155490f75242cd7a7cd20993a9ae15087ccdf33327c551caff59 SHA512 0dd4cbe03b224bfe68d00d121f758796f6e63b96eeee17261bc7d8f6ad1ef9878976b8eae5eadc2f6abee28670a83e6925596f4d35bea529fcd735772fc9a049
+DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip 59688 BLAKE2B 30de541318005736d121fe47b75f2d7941c94069d123e3818bc70fa41628492ac60f91c9579555e35b7a365b02f50cd1ac8c426e74ed9e5cae76d8c3d963cdde SHA512 6e3b4851e20ea19500af601ca473c16e13a52845e53047bc04b7af788a7033d3e7eef794f978322992ea0772050ea314d89c82d406d45b8887b3e8144f40d93d
+DIST github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod 42 BLAKE2B 3af8e0fc1a9b49cec5f336ee11de0c44d9009f7eb4162e015bc6397296f9423198bf98e7dfe1adf5a4fc177d2f5905360ac5bd4693c1e89ef2e0c05480ea8a0f SHA512 8b201304753023e173caa52520f77ab33d02e024f277c32d7ff8c85d396af368b7fa013e58ecbfa6922434aa8ad5535d31735d2e4cbb097249b2aa937159264a
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod 114 BLAKE2B 174391b10d1b269f1bfc2995955c7a1bd05a961dc18954b3a44e35fd9c1b13514f775795f276e89f8899e3a91f38057ee1246f7d8822d2a677c1a6d3f8ee9912 SHA512 e206e387409636216342dabd4dd0acd21785440c3c0b245cf8894b0a367d7f1c9c2b113e99e668fb11545944ed024743242b9e7e5bda0a0860351f5898272fd4
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.zip 10413275 BLAKE2B f8c372f1cf36bd2ad75bb5e022c631112b7a999a420541996de0932b61e24efc1ee2f0f0ce20454753df79866ac007d898bbb5569a21300024f1cd759968dbe4 SHA512 bd9c0d75cda1b2d8fed52a5943674dc2951dcfcc97ba9dfc63b57c3a01583d2ec5868908e988f3bbe926e0c316b8a4a2758e78c5cfa07e0e08cb0d0f4fe9d851
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.16.26.zip 11616993 BLAKE2B 911bc432fd8f6572984e2880906d4f2ba91024b710347dfb1065ff38b5d3b2ebcc25ee5e0ca55076ebd8d3a2588fa14656a020f30daa1c411fa3cdba751fe763 SHA512 1cdbf4081146f2facdedb2ae59acad9d9d29132fdffcb71a01648aea0a7b1a178faf28b14a5f1e711a496b7f43cfed93393676b3e9035e7e0d3efde759151dc6
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.1.zip 15058887 BLAKE2B d4e5ddf20a35e9f624054b03e9f0e1d804decceeb22ac993dfcd35c6faf5e28caa07e975eccc0bbf80273a9ad07a64784418290318dac4ccef0520c3d311abbb SHA512 260cd3683e883b02d194d906ce025375692d81b04b950120a04caebd1c51c5f3293d81175438159041e07abf7abe6cc9c3669c0afbca043ff0486bd29b5d0193
+DIST github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.18.2.mod 671 BLAKE2B 5838cbd50603d64726f2c49e02dc20957ee16967b928d518e2ba6f91c71e789e28c20646910ca56ce135dc5eb36bbc70eaaafbcae4e16561bf6b02c589ea4379 SHA512 4e3c8ecfaff7a9928357cee0bb3991d0b57d35cd798a5fa040d74d262fd68324f9f2cbae270ebe69db7644256d9e947e08b69c49c91599e9332c409f5c8587ed
+DIST github.com%2Fbazelbuild%2Fbazel-gazelle%2F@v%2Fv0.19.1-0.20191105222053-70208cbdc798.mod 725 BLAKE2B 2f299323b5ab11c51318e795cff895a03a9bd475d250fdbd127e3d942069affb1f3f761300b3e2bc64e464664792525464fb16d0ab85f1b504243af76402e1af SHA512 37d53ba8448d0d3984d9d70b22c566e2344e124f09e1fb4281d95c4aa1dfa2cfa4f7ac0ba32bdb77152d7ce68556aec1b3458106145aca60d01d455c7533c8d5
+DIST github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190731111112-f720930ceb60.mod 40 BLAKE2B a4f67fbb87e3a11ea6ead737fa808eb0527e7651baa05ad6d5cf7cb59aa339c524f6886986f58c16092a2614edec628d8251ad788ecb59d7918bf6310c187196 SHA512 1cbb233143407fb887e76bf0f188a774c0da8365a09db764983ee3bdac06c7daa47521933483d95cb87bc7a2f990cec89835189b4be12ad5b84442115e4919e1
+DIST github.com%2Fbazelbuild%2Fbuildtools%2F@v%2Fv0.0.0-20190917191645-69366ca98f89.mod 40 BLAKE2B a4f67fbb87e3a11ea6ead737fa808eb0527e7651baa05ad6d5cf7cb59aa339c524f6886986f58c16092a2614edec628d8251ad788ecb59d7918bf6310c187196 SHA512 1cbb233143407fb887e76bf0f188a774c0da8365a09db764983ee3bdac06c7daa47521933483d95cb87bc7a2f990cec89835189b4be12ad5b84442115e4919e1
+DIST github.com%2Fbazelbuild%2Frules_go%2F@v%2Fv0.0.0-20190719190356-6dae44dc5cab.mod 38 BLAKE2B c56e15e60cd0a9a721cc3ec837ba5135b0506cf6d6a773e3d19457468474b7154c60ee33a567ff91c1b696a5e3e19caf439f80595a6fd1aed96d75cd9c10e990 SHA512 39eba1762fda7a57dad8e251aa8640b7209f98e571154b8a65eeab8c26a082b1232495a4c956d6643c559eb36ffc1e47e6107063345fe59c42fef61cb03fa787
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod 35 BLAKE2B cffc4d93883796250299293231d8ab412161515e4dc1038531dccc53b3a53e4ce63dad27376d730433423c8a26165f44ec9fe8835b644c6f548751321bec8ad7 SHA512 b09dee249fe3328abc4372180964ef265d8db2b6c2676b5d71dd1f04f65e4192315b00a7f5f9f573c193d53c31c0493dcd8d441ea8d3a1d340ed531bb7468ae3
+DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip 10363 BLAKE2B 00106cd55d9f8b6bd6799713be177e95cdc6e549d06a5bc954048d822d246e41ec77c2f87b46a571329356af24ad3af25f8c12ac612e43c0a7f8e7172cad3cb5 SHA512 9ff25645bf0a60fd37839b98171adba445869762b73c1582f939fb924bf8007d02777a95b152e0d706d3a53b3c55e672e369ea0cd0c938d22fbf0dc1c6aac610
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod 35 BLAKE2B dba40238a1cc8d006decf8f91a2da0da2de08aad54514d99caa9fe3adcc9d30b648b5e2ad06346af4e921afa3035fa17e9598c3f26fc386cbf5826c64acf4b07 SHA512 70e77c59aa79899f548ec55f25c0d55b5c8644dc3bbb6b012572ed6e3da4037146469c6c1e5ef777860cb2fb9bf0ceaa4bc8390e44bad14b588d6936c2305a2c
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip 19231 BLAKE2B 5154eb78321ea4635c423e04f8a56d2d63888132c99b0da94d604ca66b6e4d8c0f1c1d6d8057587a1b769ab525300590a5911f96670b270bc811b71ce7227c17 SHA512 5210e5fb056b783f0dbbc5b7cd24623c0ebef841671a428cc28fbd9182cbf1dca39abaec6ceb4f8398e3df66059b1f95239f3bf7bfeb7541fbd58ba13ffb0544
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
+DIST github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod 36 BLAKE2B e415584f1b251058c7ad9fda35a53a9c7f94434150330fdce3e1ef768c0b46aaec572e027040773f022b5e3657c4950442c1bc17c2c9b7f5106ba26c4aab733b SHA512 f271a93a69cd074418eec8b114375ca0a196d7cb4b69856658946fa7f2d8fc40381b575f0f624e9fb7d90d180da09477083905c70f01ae875c1f1d97084bc58c
+DIST github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.mod 35 BLAKE2B de6ade138f8cd77d9609e5141de3969e8d10e31e3b7d8211ea00e2583ff550ccbcc11c2943cd3cd8cf1c1ac82429ea94f5999ff8a563fc4485d8b83751330729 SHA512 653862d43062d3bc1e2a2b24bce0e561862ba71ff628682b0947d51ce92f2ab1ff0504e838fda57c0af37f61242946cd120cddf556de82553f8dcfe80ad06bcc
+DIST github.com%2Fc4milo%2Fgotoolkit%2F@v%2Fv0.0.0-20170318115440-bcc06269efa9.zip 12899 BLAKE2B 4ee3136197b2956c83bf75c36b162ac45d05b92da738dba3ef1d5678f0ff98e23fcc3bff9e8432c58502c88eab94e2b58013ca9190b39994d9d76698960448b7 SHA512 41a3791ecc3e7bb679cc208151af7b98de9e78b14edc7d0ebf93a2113585f77da189a47c979e0eba322cab55fd3eb45ae8a14610bb3e9af295420fee5649b631
+DIST github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod 963 BLAKE2B d871aba59e67ac0338b643dcb051a0e0667941b9e4d4354b4d6c0f7167eb7eb57b4340af5cefff5c10a7f3ebd33e483b0fec605107e09ac796be788dfe0b1588 SHA512 963e57476aa2dde7ead77ddc5c325916a89248f361a74e8b66731c5eb6f6d8ba114f95e9d95fd0c089513b3f19482169da61e28d7e6e092c3584d2215667e687
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
+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%2Fcespare%2Fprettybench%2F@v%2Fv0.0.0-20150116022406-03b8cfe5406c.mod 38 BLAKE2B 4539c47d560d38305abc3bdca9ddb55ce5b2bd79da9dd4fc5cd613d645a3733ca0ebb0fced31e13b0d0089cb2f0dc5b70fa1a7dc58ea2ba7ba4ed1cb89512ef6 SHA512 376733a33ebb72892987b7ef43f4d87365a4231823266e09eb10a0751d267a7711ed80b57adf99dbfc115981c1f63b6bcb6792092c91ba88f47545f6bf972425
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
+DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip 869905 BLAKE2B cd45fcd9a35be062a91d10adbeee7d2a955427c7ea68a436cadc3681824e4867d59131d622c153b4d8bd25607bf2d01b2b6f186068716075e0f5737fe1583e61 SHA512 4aba7c43896ec1029343ec89366d8d2556c59eaf94eb08a9d9c0766ec1c539ca5491bbe44e71dba0fdb6a34261f052ccb440af775ffc0dba6b1f08c01790bf7c
+DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20190109184317-bdb7599cd87b.mod 45 BLAKE2B f83f212c68ab30e030daa35c16b4e388d6be9822f6bb3c424fed3f3f7272c1331017a90d96d9bd63f375c1e04cc437748be3cbed0bda68043c6f6d1e10845f43 SHA512 8da8c7a2809f2568d2f3fb1d5918e4ab002370919f9dbe3123c4a92dbed79425c129cf9a6cec9a41f2a280f3c0a5d685aa886c961fb1b5c980c29150ef6a9619
+DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2F@v%2Fv0.0.0-20190109184317-bdb7599cd87b.zip 30683 BLAKE2B 1229a9ffcdd787aef5dd65c8e391bd9975e59b87b1f0080cdb9acaa718ab554faed007f3a8a89691f8321781ca08fa29c70d638464dac0c7822b87c3b9712e9a SHA512 78578aab606d9e0c903268c72279b86f8e9c92d6d2c2803ca98196f0e7bd6c0d05217b4b74bccf25a9234f4bf69879e14c53f6bd37d47aad11f5704797c900df
+DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod 35 BLAKE2B 2447b3f6b52bb0ab4eb8af5ac3ca818b65bff046e0743cc8d8dd3d7e336ad121a8d017e3f7d7b83b0203b86392a82cdf56641acddfcd377a168553dfc28f3ac9 SHA512 f7d31069b4207aabc1683b00d85decf9e883387d598ec9125128724cad3b7d1f3462ffe616486e35579c97b178d703999c243a3a3aaca9223d9f661c07fe9d03
+DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod 30 BLAKE2B 28acd3b42d1340d8d698f68c95a7e0cd563e5946e5806288ff0273f9b8123f7980e2e81dc5e137ba0b642043990cc2ab16f834ec23b6347a2913805ae2ff2d3a SHA512 b2edbb00ffd0bb0ca877e262d602a219bd31aa4104757bb53711bb0d47e37305e38c85be5d309844dcada4d24a05bb3c12a49b4411aa4c824acb8a83b452a9a9
+DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.zip 18087 BLAKE2B a5deae9da52ef0d60ea275cb18f74ca5be285cc513bf7c07460d8882f7738da7f6ad10085d608d055130ec88370bd1099c6b0a22e99bdb83f764b8af303ff425 SHA512 c5dbef0939422bb70f46e94cd3cfcf3b2985a5ef800c7dbe100b0a521773f9ccfca67dc7a9063d10b0e3e7c974446bb1b38115c084e7cc4d9b22ba082d48bc1f
+DIST github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.mod 224 BLAKE2B ed5b6c37ed960da443c0aff3598f3fcf5581ade31c1689cee0339d51e5b0245c371eaccae3a19286d34c84a587a521a54de44b1d4e45b07edde516dc66aa1b31 SHA512 45322ee835a8f5e8c17275a88cc44de46c8b5395a69c56cef88d786e20dbed749add0083ca6bac2b9080d5e33ad0cb93a216b1394800d2555863658352f35b3a
+DIST github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.1.zip 23456 BLAKE2B 6031f17fb1c3c0fc5b2234b9ebac4b0f7679b2c4a7342f35e7319e6ed1bc3eaa1178e7b0d0bee239eb4f9d256ade52eef1afeb3aa5ac077a448af9b5cf4ab6a6 SHA512 82896d5a09103a2c6aa0c8b14c14df0c3df99bf4ee9dbc0ef6f15d691dbd321b70ac5e90f1f1026b51ee79c87601d3a84a883312344301fc0554f01fd1ca2e27
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod 45 BLAKE2B dc66582a694c0fe34bda22e8ae9cc136aaf22ca9cbdf04d9f72bbd67f1a8d75f3ff15136808629ca6a65f5f742304ecc50aecbf0566342999be19c428c91ddbb SHA512 2132e59bf3690999469c47b40bca0fdb48bbdc6a25d622f8bfe451ff2f5267fe939a21aaa354c00e4c2a7cd94c78de7171ca25dbaf4dea6478e68981cf4ccce0
+DIST github.com%2Fcloudfoundry%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip 10544 BLAKE2B 1a5efc1339e56b2edcf28cb40e80832e6fd1bdd2d350823eb961342f5cbf5dda16aad9e2a6804ab90f8edb547efb31d8c423cc36de5b42e221e97079cd134c13 SHA512 16226c5fba67be2c2ca456fa72f448f0da810758b615c1a5df29da99404817929527e5cb660c7000020c3ec0c901adcfd747a7b62efa474133f4aebf200129c1
+DIST github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.mod 51 BLAKE2B bb9a10a12f8443d24ed3627dfcc37589b0612f4df8b40547bbf9172f7f4fe9e1fff1c943fb92f2231b93c9f93da6b71ebd0de257f593a3566e1f1f5ab5b25bc2 SHA512 704e40ccb7df18b64ebfac7a5854bafb0b61677e728fbfcd0c37cb04598dd922979714fabae55e712497737550d97b2cef41897309e11f2b33e2ed371468f521
+DIST github.com%2Fcloudfoundry-attic%2Fjibber_jabber%2F@v%2Fv0.0.0-20151120183258-bcc4c8345a21.zip 10664 BLAKE2B 308afbbae118f5f26f2c58896aa5f695d5c653b7bb6f8f3eb7fb4351ac8f4dca715bc6798c1aa6a1808c408737d71d1231d878e8f80a6226c47ec30add616026 SHA512 ce9b4eb9c7dd526f4f9ca818c2559efcc6e10a6c50018f963cf781193040c229207944c89aa35079d3ccb9d05bbe07506f58351a5cc80829c5cc8f18b30d1b4e
+DIST github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod 39 BLAKE2B a88f3c0086242036da29be76cd8fca01d0f80c1373227435b19c7d7bcd96bfb8fd8ddab055052bb7bf5afe9c11630df81f34d3942ec90af9ecfe688859ef6e7a SHA512 1b0195dde4d131a1b1dc9df3b139982edc308759f5531ff93ac2dce8579a4ce4c5e3c614ef6ae5074d1a6d4a936dbadb2376d16cf5fc9a30740ca09786b37041
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod 38 BLAKE2B 35d66235264dfdb0f8f3bf41a405b2805bd89525d39fdc528264fa3819f9b079cb81c17a4e301eea565da031248c059487f258cf7226a8bc0154fbb6c8462893 SHA512 17213196a3a6a4e675f8bb4acde02713129611fb6632e628fd53b785368969efaf977e7b37909f737d051caa6b8eb895e2cef0a297d7b0f4c83a4864c1a2a9bf
+DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod 51 BLAKE2B 76be9b727f1114099d59d41f0542cf0f29dbfe7c2cf0790e5a39650e2a2fc63afa0784c02bc80451e04cd33714601079597288061a6f0152e36acf3df73a94af SHA512 27a66f64ea205ef5fa5e14f65ba3fe4258dc5ad69e66ffdd0726052c50b38aeda6c2a0e6aa3831308765a91313a1376c2819153f2e652bc6356b1800a7624761
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20170925154832-84eeaae905fa.zip 17672 BLAKE2B fcc09e0f6e7ce1c47da9f334f3de6998f32789ef6e15b32e16c50514fd7d8972095d9c6b45dc783ce775c42d63527fc467bad67608a01f417efdf4bd9a6f64cb SHA512 be49f73f1dcae8c2a982237b6f35329a7e5a7b2637cb6536ed2701f4682d1bf12c398ddfa59c3910055606e9cf6d08f730be20b5f994753cc93527357941ee2e
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.0.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.zip 1646830 BLAKE2B e1e692dbeb59ca732421bf406227811ac446122d1e7b35ae01e9ce0567a4dede8a905fe134f6cf5f76e1abb01f5188a04e7b369790eb90d1285e2efa195f3f02 SHA512 2b6be2d40e7b2a4e9c1291d18b23b43b17349da081cd36d254228e9932689c0a26a8c067cff16b30bb8a0499719be9b0d200d113235c2b2a638baaf71dc23c9c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.zip 1719324 BLAKE2B 1fd7f9ee024fe78ef1d464e785e143007aa8fea8bdd3ab5cc46d7393b2afbaf736a14a30c0754df8bfad31c4f8280cb3b816f34bbe70c2627d25e3a79c6ff57b SHA512 c3c9bbefdc40e664a8604606e1eea8f12b345b4bd1a4d462d87388d5a42b49eed6cb7455c3dc3062ccade5b29308699e853bd9656ed1bfe92da41be24f2206a9
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190228175220-2a93cfde8c20.zip 10912 BLAKE2B 33c18171c6efcb18292bdfcb415f25aec31e3196519c7d74826f4a6a862cd892598867b5f66cf35ff695379417ceaeed9501f17d7dd3b47e8c816b08349b32bb SHA512 be0127fe9835b2d5fa130563b2e59a30a5a725e9d7f1d0c2556612c6de2c48c6600cb69cdd668b597de19153ba095895957f68625fc004c250ca4634b59dd91c
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip 147142 BLAKE2B a28d972c54b69ead2b6fe83552ad4358b5d86985ba0a3141a68ccf13efeb2656950e664a9ee3333550278d2571ec1d92a31a6f906e9a0cb04978de6586681adc SHA512 7773628b7aa2a7b2e838e6c8a8acc1e6f90701c46c7ce5d153cbef11e80bd8d82eb09fb4a6a6fbf54beaf63ca9ad88d92bc7be1b0c1ae741b9039810c4780766
+DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.4.mod 171 BLAKE2B 64282936a780f76281af34f03c3160d72813fdd40437ccd31d66f91d8801bdc43687a230d71f55ea2e8816d501d67686225f19005c45e5485c8a8500f64c7d11 SHA512 294c2985f44f8a476260ef904bbed5627f33bb93c1dc215ffa77b287de8dbbd9ed500aa6bb51b471017270afa1ddc85b5847d3aff2e7bc7a6ce285cf9b593f24
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod 43 BLAKE2B c7642acf73b5b5f2464b0171c49e0f272811a7d08af54cbd773da1c273552537c51afa84935f5bc682ced8c01668606d822506f98bd872f61bc032be8fe8520d SHA512 0853d89627b3b96d9dfb2401800def229674b13e43653636574b55b9d754669e6edb52273cd8ea844a8f4564b9de1114a66e944b98e2e0bd572db9cc689d582f
+DIST github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip 6384 BLAKE2B dfead99a3dfafbdfa7dc97a4e38254d68c5e9cdbb6f21e7210925a097ff32169a9139fb7ae2699bf72a7a358fc881281794a175cb13458e6170d031270f203bf SHA512 16597d7a11876c94c68583833c1b3d889b9bc2ef63095cb094ed6256996d4cfa39d28e551f79ee7ae330c6f2bd1b27af6521d1f0244e45a6d8510f357f545109
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip 2122054 BLAKE2B 1458b507febdfc4d2ea66830d39f3a1e35035e8e5eafda45de5e97ca67f0123134490764b8a37405218357a1d1770404e073cabdfc5d3a5dcfc1bf13d2e8f440 SHA512 7f9c62b3ebbd975e69b5a8117702d96fdfe8679449492a7de1a81950bc2023c5a114a64f9e534ccc971331f5c04ec0faf0874a47aae532d8751785ef260fe2e2
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20200303162255-7d407207c304.zip 2048624 BLAKE2B 45cf8058479b1e2c88a9553748f5c195898932f0abf98de8148a486928d42d0285d67d6167bb63552719c76cfbe456d5eeaca5086be0f63c23dbc8c850263c79 SHA512 4b6cd616938fe091a8cf948d5ac886cc0591d40808150ec3659cc4ef3d9391aa00bb3edb6101528b08caf32fcdd64fb994a20c57990d8f0b6bd77c1933dc7966
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20190924003213-a8608b5b67c7.zip 3672892 BLAKE2B ce75cb2d21b4da6dc52b5385527a776ca959e89e2e681746b12d80f12e398e65fd4432e151d61858ce049278d0a387bda23ce176a1861e4b62837abaa6c28685 SHA512 c6da9fb54c65cc04c1174680f9a72f678ac02a5c79a198c8940ac08f31e306b73a0208a76cad9bf3a683f62151d39f32cc7e17a6c28e971297433310c6eeacbe
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip 41818 BLAKE2B 6ca108ca56e91e78fdce88d8b76b1bdc512b90094420a835ffe12da142cf77e44b34abe20276262f65574697f2b1ffe49f3a1d1885fb68d5c76804a7c0669967 SHA512 c622c80c2431280c295ba6fb7f1cb0306a0156d4c2a118d5e22294a92b5bf30cf0230540a979e94abf6dbacfae2fb9298384555415d1efb0a2c1a02863965efc
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip 42715 BLAKE2B d34249f3328c742dbedfd2620ca178ff29b909c31606fe7abff0eb9e04dfdd488bf51f4faf489061cf540fc765a5d0842ae3e0d9840894ebe8b4c6d8d7793847 SHA512 ca175bd5bcc7757538ad04b6953287f8c869d5c5ed2e4f930cb3104b7a96f73a34c656e85d1de054f2b982eb813bdf5b02cf7dd89c4824a25c8385add7778598
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip 13789 BLAKE2B 1961aff6de16c83f1a771b94965a6e5fc95a951033d93b576cb1567b008473b5fde0a12078179738a921ec88752621281a36137ee6719d4a1110ce072f450bb0 SHA512 66587313fba838dcea2a00bc81222924d1dbf77bfe47b7ed0443a071c249f14204b8e0765146f060009c8d840dc802ff701d6905a4c05b816ded9adbb0a0e981
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
+DIST github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20190624125649-f0e46a78ea34.mod 36 BLAKE2B 4b8cf468872414728e3cb5f49eff6ba10147cd8f2803b0cc415506dd82ce017facd77e78a9875d83f5c759de443a82545d5f447ac8351b4d74ca77892cb94f45 SHA512 abfe66b3242eed64b0a243bac35f2dc06faefb3b5c1dc27b60b150990a2e0c6527e359b0d4e1b48d05e6bcb5f1ef8f6f67e011691b57d4eb8b8a0208f6c8135a
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip 71118 BLAKE2B e6785dbc9c2f3c8d61fc587a7a4c73ef2879a7931f5d2c70f7eb6218425ca052d79d2e6700f4cb2d9d716687d15a8d6cda2a29e2bef5fada83619ae5651dd45b SHA512 11630ac614c099c7629c9e9399b5b9393690d145c552b5943d09f07b9b4f79779f04be4bd524403afcc9c56d6a32da657006ac76da254dafe71cc9712007a125
+DIST github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.mod 125 BLAKE2B 4a0e2b8665e7322aed6875da0592e15b3a6f3e2df4a3505dbd0c252477d12af4aae248112e361eeca8f7a65c50ad2c4e89522ccb074b57ed25097d47ce2c3704 SHA512 e211a648148c8265bce33801e7dc8a83d5c4a853f1e9d9050e18b0b10f3c5763bef4fe343a4c54b6bbd19f8510e6105dd6f8dc410dd36732d7c94adca534cb4d
+DIST github.com%2Felazarl%2Fgoproxy%2Fext%2F@v%2Fv0.0.0-20190421051319-9d40249d3c2f.zip 16696 BLAKE2B e0a2e83c176fd8bc898c5da7d1a50346b5a737b10730eea20873c5aee9930ee30800dbd8edeed70b5684180b2cc43288d476bc6f04e9567a62e0a68e798e6967 SHA512 3f14954c86b3a33023d5d7d4c4f85ae63bc1adbf895e9146c5541e8360c0c4762383da0a12cfdcd2f316e39ae6e43a78f0db0ce870d0fd1599abcd38f740ef03
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip 111939 BLAKE2B a433cec67d0b6c92b0f65df570585252d52b9f2c324ac0bd50eb0d5c66d07d2c882b05e964bc55a37f7da33d3caa4314c412278b0070f827ef1fcec26f91ab64 SHA512 76a4e22da8f3a310cbb6d1460ab5c7a8cc4ff869c43eed060f062577e0632a11e722b7c8bfcb2ab22b2164d488e9725c4628fefaa97a840fa894260e8901c240
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.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%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod 39 BLAKE2B 869effe65ac30d12ea51ff1945c803b1eea65547381e0ad01f37bf8a68c263a3793e03c7dbcc7cecd0c882020e506cd8e1f2afe187ae8f9c2cce03b5fb9dcf47 SHA512 172218826ef7cc862b47a76156818293267308e8193a2fcd7d0a56b67397f9ee8bd3cf136b4e94c6cf045145189d9a579df05a48c7b413d220d6098940792eaf
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip 18363 BLAKE2B 489ff272e19922758a7fb1b4718b0f409514f24999ff4e49b75c301c532ee8f0cb3892cacb98dcca51f58ed27761d270a433eeffa0a6be5ef9ce6540aacb5c03 SHA512 1ef2ae9897702e9eb32b2ccbf6717ebd92f647ba6874de1e4f1fd8ab668ee14e098b592d6f8b9320e5358f090bcc7e39e6c708c572771f05245b9d4a679b98b1
+DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod 39 BLAKE2B 7045e72ec933bc321a8d41526812f0f7daa1961fddb7c5a569a4b104f8bbc853b171ccc52aed36807c71f188130a5810a49458a3807d2c38949f625017421520 SHA512 2b1644078068dbd74ed69be1be7ff08e3acac8fd53ab723ef2f9f2243b70fe60c9dd427cefaaa5364a93fc8890f8c906fa8d818847ef0b9b4edd9892f2d2b2ae
+DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip 12204 BLAKE2B bf6a8261a8c28188279787a64c7f623c261944077babc98680b4575659d8fa2f53a7e8d7ca1f1b606d3fb778060e37e91dafb74796c9135c637361f0759c34ac SHA512 90e22e25cc68002193dad1f28fff7c271928f0de2fd86fff149a6f2e9e6833dacabad7f2ad991bc4bf520a5f5bcebf24150fec3f3bb92439cc3bace60c304830
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
+DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip 4266 BLAKE2B 962bac7897b7df9172d558894454576e60a8f0baf852e19ab80e658066daa611cf59296d715deaa4bccd4494ebc81e5da32d9d723490834c4a764c6cc39e5ec5 SHA512 e7e9551abfed9a626f8054630faa16cf7ce23122e810f0ac36c3dc63131b142d8c23b615164f54f2a6669721d0bc5ce0a03973f5e547b86fa79c0cd94e2197d4
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
+DIST github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod 31 BLAKE2B 57a4e94b1961821176b03749269d51319f7494067249de4856cd1c25a936c66ebc6dd0488665db7cedabad6a21a6eee02d3cf7e92be4a06018f61f4e60db1b7c SHA512 43924124919ff4eb8c71992f4cb8c0341abe1566a9a8cb17081c05b074ec9e36ee8a4cee0a686d9e54cedda36a1f2744e9330584cc1a5987af48a8000b224a28
+DIST github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod 40 BLAKE2B ec71a9aa1bb1a9be9a2ac26e68f6b718af45320939b32b917a5934358d9d18d4d9ead51eb4620fc28b41c4f2a9866fc4c771acbe5f82e70368e8d66b529fbefd SHA512 c1d72393c1f4210f4fb8ebe84611d37c50513a5df83aff4c940e8cfa03a9c1583f7ff72c27c4a5118cbd35d3b27d6135506f1c1a35c712af90999ffc7f3df584
+DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod 537 BLAKE2B 7a70f84e859adcf37ecddeb2e80e4c1302dab28b15102ef30b995d4a2986151c6646f450705bb80b815cefbc80d68a26be28834c89780ab05f5e408ccce05362 SHA512 f1d930fa81501da87f58e0f96e7062be5e1406a1e99965ccabbc154a415cd2fe3fb374891e1fd7362f68003282c4bf59671a8521c5bedc064df9a730fdaa8ce4
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b83cd2eece5006f2bdb2224b483372058c70a2374b0f8ef6e01625874653e93f804d6c95431c0d522d775f40e799704dc31a07e69aab07b690e0f9545 SHA512 bc80cc006c40939066739019c1573f78b9da54efa1f8bbc606865ca6355aa26deddb06f2c80e754ef74b9a7e804d5f45c50bca4870d9b7b995367aba2ff95281
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod 38 BLAKE2B f973673320ec56ab6d8ebff0f6a789a40d5f861736377298de042f2cddf926994bc99611e4757c4cfc34b3dd515609ab9b5dc2b0501d1929d8580b115beda0fb SHA512 23b05bf2f58a7e584e301622fe71160f6d8ef32236c48b2ab9f6afec79cad5afcdf7dfa729073f7b29f1f94fc181c86197de2f05f9e80624411802f55f137c50
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod 483 BLAKE2B f95e0948ad794bda6de6fcad4ec0414d14d448e40b60b947b583e430e0357e125adb56b8cbfba060d5d7439010e8fb4c36e25240f7a6d65f46bb8ece1480c23e SHA512 63845faa6486792914fa0644586a0aea98bc44d9ad802a1c90ccc52aed39609126af1cc09067d547782fe7cde764c77fa2b687648e7fb0b3de339f94c097183f
+DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod 334 BLAKE2B ca61c4390ba8de5e9fb81d62cb7ce1ecf7b22983ccfeed6b4a8bcbfe2f23dfded897d41408772d4d4d23fe4623cb8afd46185227823a333074f5be29b364362b SHA512 e98697e890d24c66eb807c95f9a58aaf76a6ab5dd07402bd7d928d458bb9af5c72c96ac9c94bf348307bce81c74d1eae94450ab6d9463e41e2dd46a533fb6e97
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod 182 BLAKE2B de615d4a9dbcd9a22198ad71876ad68a2019db3798b6acb5a36cb67280bc9c7ecf288d56de6cc0eb0cdec8db2e485f2b5054442a9dcd3c1049226c6fc3fe35b4 SHA512 d10f8eb62276da2872925ec90022757904a9b5a7afbc6f178f2aa7ffab1882e0c2eb1e26762ec208ab1d1aaaeeb44b800f0f41b061d8b1a9a9fec5a8c098dae4
+DIST github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod 130 BLAKE2B cbeafbdfffed4eb5c91295044a618d126ac876cfc56ad60e909862e77cb35576f0efa88972b5194a7095003f055102dbceb88edb792be3b47260c7d1bce9b5dc SHA512 2a23a7db04a32554bd2e502284d024060fa39df72ce5bfc6df15a11dad312655eab10f16710a18531cdbbdb464477d9bb88b53a17f364c8f7562d1df7436ecdf
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod 335 BLAKE2B 9090c5311a481264437c2906edd2c7cced9e66653739156c88bdfa215612e17e6105edabe34e12f2dc7b3081e53b9941d02b3e7b61cf972c0da959cd855ccded SHA512 33d493241830d340c34e440c373a9f8ee35b4eb1691223d9e4c746db1a5416eac573ff913d4ac3bbfedd4fd738dc798a8840fd278bd20ca27c91100ca1c9d376
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip 18504 BLAKE2B 96ca3632fa43a2e7a2aec8e72bf5ea06374096da1c18656119ea5c1ca1eca55bb82b1075dc1ff478d290febfcdc6d9596e8b6400f053e611b0101c8d79154396 SHA512 2263bc61ddf10f0ab76b3f0b3ac2bdb91e30894e6fdd48731bd3595c9005884038bcea0bdb09abc73bf9a68c03e6b761f73b8cd60315c121058e58a4bc7d18be
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod 363 BLAKE2B bec8f102ff2d1cf0d4e61960971cae49e628ff3678b0a6595fd4add3dc6018684c004ff8de4a7f60fdb5ea8fa98dae0507c619f148836dc9287cc687cb9629e1 SHA512 b9528f1a273596c8227843c7b5513920f78c25b859c0d095499ea05f5c0200095f28a344c5bcc913b61c44f71c5af50462a2e7e2ca6ebb9670c5875096118998
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip 16705 BLAKE2B 61428f887e1b321afb03e2fdb690c4d4d073c343457472fbbcf48b841e49e4e4e0b9215ca217982951bd3948ae8a2efb9042cc87f7ccea1b4e0356358aed98f2 SHA512 52d4c005063af04b2897f5fbc1d23b5b9280701e667949441ca19db9ab8484dedb9f148e5052b0d785aa24fec8fd27a44faca2cda4aca946bd0fff92231c515f
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod 221 BLAKE2B 868f9dc1980e996cd0e1a96fedc219e5277071d6d36a35e39d57672c1a2123f1388bb722afbd087085f91a16bae62167852d94631f160edc1bd760b1be3db367 SHA512 aee9410d5bd44b38fc2ad7627cd87f158dadbfb9aa9ba20db1324c44120233891aaf03db712ab5bc9478005992388c26d6ad5acbdbaf131c9f1c26d7d864d5a9
+DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod 230 BLAKE2B 00b69214f0de6d8b6b38ee35a856b7d9e6f44c372c55f54e9c650c85c19b69f6194540c8236569ee69d25339802bf51ac4ac89f78600c6c1e8c7f34228126a1d SHA512 978d42cff1b1bb988abbdd1997b6b1c215c23e1271378f9d3fe7252e8ddc3e19a9deb4c93e15a93bd47a5f8b6abd62118cbf8a26bc43d655308dcf0f623a763d
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod 37 BLAKE2B fe2d5da39fadf3fcf32f06d968157a8e8dea075a9d473349399f0bb8a04370ed0f6e17f37a333f5aa2bce1d2bfff644656a84c5d1bb65cd00e4310886435e1ca SHA512 30e9611c496c86d8331d8575ebd70c9459b4d0377e36bf024d9934fb03ee616665812373e8aacfb814ed0cea25924659a9f1636d65015b929a4652bf590d6322
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod 1074 BLAKE2B 34cf9165f8a795cf1b2182addc17dc5cbf6cf17306921f7d6b35c0d67c9f85a9795d19983aef40c7a9c9b3a9f7c24f4313c30f3774446fc9e8b0a6ffd037122f SHA512 ccbb2dae7075af582756a35d6fac07d92281d3f58e222bc79404edd3f416d4a8841b6f75ec6ad1c67bce5d7b7d9ff913bb42e3ae92e7cab86ac3717802d1a080
+DIST github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod 546 BLAKE2B 5def96d32f37b6d5db079cc1724ca10c0be93f33b06907aee142e45985bb1891c8850fa531ab10f0405a34cfaeea5adb538401c2ca8955511d758ca77f9bab73 SHA512 99fe69cb7910196d46060da7b382457189d9085c9eb4c15ee75c0acdbae283a5bf8df6aa30191b3202793a071301739de57d972b5daa2be81d86de9bf08a1c85
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod 635 BLAKE2B 307198d3804e2ec4f864462d3a07dd070c6ac4c66b4e4a418b9734abcd02b617155c52da0eb59d29021ee9a0cd2700f0fa0af1f8bdf7f7d6bbbb6f9cf6daf4ca SHA512 3341e7a77c6a0aef340d0247f2c004cb9c2e5ff864a43d26a2c74eb73cc4a3cdead599ce7a1251f23715fd9463fe8e8e2c2a3ea75915664711a753cada3ed3f5
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod 515 BLAKE2B d901158241d70a76b23e81549a51db50d1a446939de537688dd1a43622b59ba7c118a17c697f6e2753a10b34d5f806a6418bc20de8aa35802c15ab50c87dc295 SHA512 fa3615e0bd38c5b0a55ed3a24ffe0534fecdc8b36b44ed47d7ce3784bad810bb2d5fe451fde2055e7c003454bcb20e9f560843056087e9b20d7afba899af065c
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod 589 BLAKE2B 9446db5ead7af8fe9e74376580e35fbec6d00ac8590e3e6ed4469ee237f549da84be7a1c282081a65f6112119d9af29c11a603640ac8dedd45e807a9582a55d3 SHA512 23d81877040f9b00f665fe8970912d413e944fe3c811970158cdd2df6778a4170199209de6039d535a896a87286392a2e342d48743235d99059ebda16086d231
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip 281786 BLAKE2B b540c0058c510680b794848fe71eb908e6bad64159240c2b3df08fc6a8fa899f17da1d10639179f46e517dbbe75f6cfab0850a9bed20e31873d46e481fe06133 SHA512 f95e4adbd3f364f4ad98104d478043158f8eb538562e9c44f80b8abb6844805984fed07929f5a155b534b56e98a2e08343cc526e78128f4945e40de564a68855
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod 489 BLAKE2B 583b8241788203b1eabd49c8d50984bba7d8c1bc118aa6983bb5c0598b975851a8a955810e51cb1caee62861f4a70e02d8ae1a9d63b688871d39e175a325933f SHA512 b06d37197a7ab73237b3ccd8252bb4c382b61bc786ca26cd2fd9106a0deb4917f017db8c4101c9e21df31f4c685180c1b684d0a7075551e59ad7a7f67a07937b
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod 498 BLAKE2B 328cbeacdb4351ec3a4556df283d1ab23bdb0e2bfcfef6c516b1fef24b7591e55723a425d0e59b0ecb1ed552198d752c9fdc6977cefe6edb6f3e028dd080dbf1 SHA512 91813eecb164407460a706e6b22b368da59d9c1b29f827d95ff56ffa1c8e5fcb77dd7bf20fb830febd6ef597aa50ba63d9617540277c6502933a96ad63370b77
+DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod 439 BLAKE2B 468211633ac8a95203aa1a26c04d10b0973dee61bf220b68546c97d119838ec451c627e8d598fe6e9db1b0519a55522d713498e4ce0655113ded453800789d51 SHA512 8fd770f491e8e65fcf65714ac59b44d6d967570dd028039b4bea22155261d95a7ce05688cb9bbcc2f40c9e55fbdc89b673a0f70e3522bac04d508f56f1098123
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip 49381 BLAKE2B f83648e2877f57671b8a5133f7b6d0ee36e6d48deb9d4684e839e1d3eee54d721aa536eb41c713f584418916e7dd1192742a87faee77a015496aecbc58759ff3 SHA512 64d7a667df12bb1257a8f1effeb177b0970fb326a54a72c211c781920fa8af98234c0fc22e699af099f0efa3696be2dd5314c9731fcaf74113aa25ffcbc1ba19
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod 446 BLAKE2B 50730422149ba32c04e4c1344feb09e0fca7b5edeba41e4b11134a2c5c4d80f222c216c92297b0fe61b8fc081ab9b493530d4498886a874553f24df8dea31bef SHA512 acfc9cad354c8ef9ccd01df7593edd4f025d6e32dafb096fcaf21d5de8af1cce9607bd413b2c31a400e94271136710294c5b943e32a76d4b3304c28b88173f42
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod 419 BLAKE2B 1d7e2f5a1658dea6016639a05385324b0769a07f563bb1414d560cd34d47dc64d6fab2445fefeddeecb8e70fc0703f7a174f1039a4f9948590053bfb4451b8a7 SHA512 4b81b994907ffdc0489ce9755fcb76c12b8c80a8c1f3e94a0fd628720fa8bd495b73eec430390151e417fa6d04e7784fe3eecf2efe59149f26f0da953f6598cb
+DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod 616 BLAKE2B 195302c90abe853d5c39ecaa800355007bebe9eaad6c6a57e49d8a432d1d30440c213cf3b5e926f5264a65aa22a9cb59b58fcb72597fe38344e943a3ba8f89c4 SHA512 099f9d1770c55309210e8885d327a0c1299a429a5252335578009d415b56da4f30c1ab37049826f9a6a009a9a8003194c60a9837aa733e74578b43848b16c33e
+DIST github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod 42 BLAKE2B 216193a7027735f9581dae8cb67af9d738b3a1cb66ed0adc2910ec9cf764e36fc967a138d9fcfcc6efaa7217cebbca486a5250b4ae735c0eafddcc0e6b50d172 SHA512 c6e05617a90cc1e66fa9af0d2cb4e1673aee5647d3bc34763b71992583c4e9159ea74c72ff65ef70322dcacfcef0793565ab6b92b4e1a964bfb5cca70065f316
+DIST github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip 43941 BLAKE2B ab30b5c9f64dfe54613268051314666d4a48b1350b85d6dc2ae0afccd0985cbeba91e81be5a08cbf1a93f4a0d230dea3953efbcbe1d2aca718a337c22b0abe81 SHA512 3c67c7c9b54bb704d53e5271df16d03bd54b60999671bc0c02c7811091d847ac8b1e33fa4809e5be1c5632223cb8c885370dc89d7a7e79033a5fce8ba20d5919
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod 146 BLAKE2B 929c15d08be251ebb09aac169eba126603d1f3bc4c8dfffa22b26baeb368d94d4725e3d91425aad4e96aedeebfe91f43b9dc707c5bb7bb11c28e44447e5d1b3b SHA512 fab7c8aca8025f6ffb09bc7cbfbbcc86e1a84608a1643b4443a386ac979aeddf6821e6b67538a033098c22a22c251077046c38b05e08bd8799deea5549b8d8a0
+DIST github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod 134 BLAKE2B 0aac384b872ae017d32169a21e2688b251a70d4f9b1a3479cc369d34ad0d81688caf207501fe6017c02764063d62497951270a3e2a2babbde20ce398dcb590cf SHA512 46da2d05a4724f95dca3057c5631239f1743e5fe3359bbdd81ebeb02fc13a22b59e69476bcca359361bab2603a57868e75dd8403cc24e80a27178ff071fb9028
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod 38 BLAKE2B 91da8f19d193efd0f0b989efb3709c45e4d1589419068d9dcbafbcff657f7e8983b90913475bff44b5751dcbab875e860909a4809e3af7546e15ccd291a1e69b SHA512 76e9f50dd3c96285c56801950f80d04d449d5d78c2b40341c3e51148d89430d25870e27c697a3a9c878a9125864166f0807591f997329548fb3fce0ac18f7575
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod 145 BLAKE2B 31ab68cf4047752783457514aba06de88ca2303370b97c45cc00bb31cfe7709f3eedf75eadd349471224e6d6c1445b2c7fcd7c58bbdd60023220a9e104a6da75 SHA512 9352d6fc784f63dd8bef085a0022b942db57d50b0d418aad4bd514314b7df65ba329bf442a063a0d6ed94da93c47a3f15c77b625b40f1af117bb784c43a27f80
+DIST github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod 39 BLAKE2B 81dcc6f162c9539d5d6e9020b8462fe0d6be656e586fb6a15769f9b01e4a490e0f046e8bddbde464449c8f5f33784330e3972e233667be06989f985e16c00717 SHA512 dcec826b59ea3bd9f37e07b4625b06d7cb61e3757cf7d6c221125bdce9711cfa1a63ac592a31b2174e4e3cd7f4d8a7ad51837f777e014dca6ee53aac5a8ce328
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod 36 BLAKE2B 858cc95b4dde2a42ec1c3da0ead7b815188e8d6d61a52194e63f5e1ea857d4e3bff22897b9d704256c273ff0730c13fd8a17f20e63f732f5768b1cd8cb1b62e7 SHA512 151ada61957ea2e7289b17306db06c40628908f9e3ee93505b57d29cc859c006d796e1e5ff5c330bb6b00655f9f6fb6c673e9bee25b9553b28c769d372f33dca
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod 143 BLAKE2B 8ff253d164a2ab5efee3bf62889075fe44e6ea4082e373f966c6a8f06ae79b8aac5f0edd2149d1112e523a8c1a8a0cce9e84013b2938bbbe1e09ac60fc7aade6 SHA512 7745338e2a875f382668b54ba6f71298ab6d50096998d57aff2fda883fd5a4c54d7b8f24251363fbaa380d850226bbe233c2705b0fa230de95aacde042efc5fd
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod 39 BLAKE2B cd422bc62dddbd9fb0cfd9db5d387d4725e5798238593670cd92c4082fbb0289ab6abd7fd3bfd3f2b91912d6942f0118f6057e09fb852bcc0db6ea19e792b722 SHA512 4c83539dcd8968a62fec2883c88c490ce39315ef61b2d8cb96d8767fecd91e045709efa48a18165d19a7d726bceaa53ae2bc8122c6f14b9ea0f48cb461ca82bb
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod 102 BLAKE2B 80c36ef24ee2eb1d9aac1efb8e1bf3d54d229562fa42bdc9201d57f0f9c9f1c28500d8f344bc9803222c10f3b1358d1492cb2ee7e7fa4c4ab60ce84e0205cd88 SHA512 c69ce2862cb8cebc9bc1b24e6f18cdc8ed634ae5a5ab0ed5f00d95ab8315b146bd65f8f7960c90a8e42dd691b2b67da173fa81a5778d8e075f9af2f822ede211
+DIST github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5ee28988c889c7536b2209c04b61b04c4227d958b516f29e879c51e28e348b0fd9eeb6511eeabfab51c1a72083f65c9e1f6553213cb99b23b8e966f4fbd1941a SHA512 caf03dc50181a339953b27cc8627613175928b80a128473e4d10701f3fe536a66758e199c7418babe3915cf9aeab51527ef66b98b0c084209314bfdbe53cdb5e
+DIST github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod 37 BLAKE2B e168acbf68a0195c45b153e25098ece619b2656eb02eb648d2dcf11e6c7bab3fab50cd132354d9063c1961879127819944ebc1dd8d7e1d0987cbb91a86b35caf SHA512 854c0798c7e4ba498b3b6efa00375a93e09d84c3a5de042aaa8b58bc75df62cad93e2e0d4876f43de0d1e2956062cee758c8c7aeb2c0807e994f4153ee990624
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20181101234600-2ff6f7ffd60f.zip 89025 BLAKE2B 63ec88f6d0ffc38987dae4d66597afd22fedf3f18aa63bda84065ba605f92161c617c76eb2ef144f61a0d5528f18611d26c88d483fb1ba7826d201999fadbbb1 SHA512 e7c3e2679b619563964d748e90f456a8648f5503c053ffc91f8a6a2c14dbaf802c2885c0af119bbcd81c012003723abdcc3eb99f839620ce8279e24b8b253187
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 2461758 BLAKE2B e02c6e6512de9be1410923a6b3eec36a087f8de00e1d1e715a61e6f26a18352db169b1dbec49e3d563e294d8c65c51ca5b55361dff70d1e9e20976e46209209e SHA512 7f9d1d2671c82a1df5f79a154340dd1fa1e92952feb03a1ddaedb1f6cea371bde8d6f7c774a4351aa87abc2646f97891d0beb4d175fe9d51e2f761d37f2699ec
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 39653 BLAKE2B c84bb2352695575c56a32eb0e7a8d93818b15625d850ff662039e5650f78dcb06a093203d0987d00a2271ad02e811182cc7fabff7f8b5d5475ff2628d18bcb13 SHA512 050f33b3dd4053885c46c07e7f56cf45d6addd908549ca5ed98036aa14e964a7ff4c30e08887979a69f25df85af131491fc80a62c36d038b1f3af5b3b06756dd
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip 77887 BLAKE2B b83e776eee00d6209b0470b2a68588faf8d0a73f3624ab036b6182ef413326933bc9265a2435984a08c7c1ca95731cd8a81c215c322f720f3a9e5affe7dbf689 SHA512 772dfb4b62d9091afa15ef6e0e12f23844db25846aeb113eb513da1b0bbaf51d11afc327940d8f5520be2d239da0c7cbc02844f3e26ede26d70ac3428bcecd85
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 85123 BLAKE2B 89a11d5b2c0abea9b2f391dea5fbd539b37f7770623b7e535b60d902a33ce0bd6a79928569542e932f117548eece074843303cb4c0539cc8def54dce7363fa25 SHA512 1bf7c75b83793a806e6e664b987f6a21561be9fc687364a6d4cf9fa104df27826482fee467dd752b19f349de2d8dacc1c390b064ecd4eaa2fde6d74bc10af734
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.mod 49 BLAKE2B ca631326232923d64b714e6fe413e791603f07f37932eafc2f34e9d70b527b33d671da9603aa2be1ffab0c8eb5a6143d11cb6cbb1137826f793534750a4cd3ac SHA512 3c2a09e74993414514d6e6039bb6972c5c3b2e3dd26282f4774222344c1f0701d4d4fd0931d8f648d1098f922feb548c2867617fd4309806c4dda12ba022140a
+DIST github.com%2Fgolang-collections%2Fcollections%2F@v%2Fv0.0.0-20130729185459-604e922904d3.zip 16178 BLAKE2B f0b201ef512f6f6a65763a23802f78520dde1ea6fe5b65dac54c73171324602fd286b0fb7dd37e9b22a7da6b33410b6736629784de5948453633629b62de9747 SHA512 628b55bbcf300cf71793c6c4c3aa49d970cc3f5641f1192f2ce75201b4be061f7b9ae569e2e091238dd09843dbae2d9cef143a18df830a5fceb0a4f5e8b2a844
+DIST github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod 33 BLAKE2B 23432552289b1edd0987877da8a828994a834b67d0c45f7abdf72ba2cfbec12ac90043623948526f4aa3267d462158cbcac90017c377bc89cb715173fad2bcdf SHA512 ddf0d034279047865a7f71bb3745e018b04a65613eef67c75ab246665aec2c833cf41e9d4b2583d89498b0e3e516a7b491766d9935f2aaad861ff67091e23909
+DIST github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod 32 BLAKE2B 23ef6e127c4b643852b0781780f448c8f16ed5f7a000b13008f5114338725f5ba573615385f2e158e0c276e972d7f9366943c9e7cd79973c76426f332f100bcb SHA512 1fae7cd9fc7f93bd10c51b52d7834733484e54352a4cfb812417e594968de4096b8f6fba075c567de411b1302c0507b0c9c5c1d71874645da73c28d434498754
+DIST github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod 144 BLAKE2B c8d7e8f039150472539681c78080647400cd4060f42bd70001c8d3bab6d848f4e0a494a215b3d2731d121e724340db54760d2647b3cf028a0487ff16c22a2d8a SHA512 3326adc96464208bbcac0c76f1c61eed9f9cb2a3f8d2f904540c0b9b403e68cf06889f74801f2be5543ebdd33c9b343f575baaba15a3618be358a4c6f7084d29
+DIST github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod 35 BLAKE2B 56b6f7c64d33e2b51efc5ab4c705707a51022a007cedbb31dd762a78c9fa505b061033616899afc96c3e2c5813d4cbb0429e2094cee6f83f063e96082717ad24 SHA512 8d80c51b78b47eae5fa22780d52cb3f15c54eedd1827145c9ff52a2143ccc0716b415284a9cab9ddc09da97de3b5dd0e8ff39fe0b2a748a11e4032a4e870b73b
+DIST github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod 36 BLAKE2B ea25f08e34968cb929b9f85c2ae1eeb2d6acfbd0fb851774b86435b7dae3723a9978028789acada42f1fe1fbad4d8d0ee47b6c215b32a839be4c6064b6695f90 SHA512 404ca2c9b95bd4d33b0e8203585628822fdbe27ad4ae9c6d2f2001a61b442a8ad16fc5d329cbbf32aa076d935cc1fa14ad1e0f34895ca9641bbc13ff288564e9
+DIST github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod 35 BLAKE2B 7fb690e1792ad3fbbd1aa7b35a97c4dd29c00187f095deda8dda7318c96a79367d2337f7b26151ee578a3f0690c5ebfb6cdc9f304aea66b8f2b83e80b7ab360f SHA512 ba10d5331433fb94b6245a146c7d76862ca96700431609746a6d1c76c3a1b615ab3799b463597eee48e57c91b9ac299e78f33d610fe398cc9316b33c99961c7f
+DIST github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod 35 BLAKE2B d79807744b67e1911f0963b12df80a63782888e17d40e8b7beb1c66337261dd421535c86414ed65e807743a804c816863ed767e3109d2ddb4e3ce6afc7b3eb52 SHA512 e973a3c52a646538d671237569673b1bc9433f74c2e2401bdb022b222e623f230aa571e31bf1f239f1558397bb513c233c6121225ee02263cc92ddccb6372b4c
+DIST github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod 33 BLAKE2B 23d1df1d0683de5686b23eee4468e429f2ff021bc61d01895de1769adc5355eb8a13fb1936e736bda7d96f3ca9496565802a5f8d042ef9fad7947ed8fae946f8 SHA512 1b14a6fb3fd86cd47758fc4682d015125a08977e47d1245d4bcf4e6137c60880347c06c224b5302321000ea4d18e88b3c686527f18d65b3c0842a9ccabdd1df6
+DIST github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.18.0.mod 3590 BLAKE2B c93076c68ffbf3620f660408cff2e174cad31832d1991afc5a1d13d40d9d0a277f5233f21448b4d8303c8abfa22724715b2821565e44f1f121e312478e55349f SHA512 85bd999602faf65449dd1a23bf85d920290bb776058d987cafb76f60e006b5d56a5d293358040ac2f8465a29346258164c6aa518e5c3b8151bc1db732fb548b6
+DIST github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod 1097 BLAKE2B 73b5196257c8d65709d4a95497084a4b7393981123e2b46629055a170ac11e0edb6088d73f2bfb132a0fdca66d8e5ab4eb72c82156266bcd1e94880bd9582a3e SHA512 e2358a1ecc128e330903cdd3a64044ca21f05d81840ee5df68c10d499601513fd1715da1335c05a85a34d1888443437e6fcfc161d5ef6e8569d3d44db268a959
+DIST github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod 39 BLAKE2B c366aa7c09bd08747e032aa05afc63507bfcc7b39682c7b897d489cb854c069cb2c5df45c0ac9795dc31b8e44401aea04e96d43a22c040fbebb2405896a9550a SHA512 6bee5cecfae431321e5172c428a9ddfa7166d84c47cc7debcd040b7db1a5ae5234b3b1b139ac119e2d484ddace4461da7c6d053e509568f2da27b92cb2c3861d
+DIST github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod 97 BLAKE2B 2147905b767052fc5449f42ff72f328655663ba63eaaadd8ba7155fbdd228c9080babe746b616245f73c9280970aa5321ed6138dd8b459561f07fecec8a3633b SHA512 cd29b90f781929ceca7be28b208aeaf51d64178caf1aa9e4f84ce38c8a8d48b846578ad8438403f64cd572448c697212df4f2ce7255956e43f366adebf7857f9
+DIST github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod 36 BLAKE2B 9f5e639d6ea8aef657af550d00e4e1f8ef3a042fd8ff5e4dcb031789b24d9e6d72cdfd3ff654041ece93d38d53f7c1a999f5a095bfcea12392120b106daefe9a SHA512 b199928dcf91ce17955d3a426861aed80460521f7947206136dd5bbf2f02d181b549a152c1b78361e761d5939fc0d05f04588683da3750a34d71bf34ff4b3502
+DIST github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod 36 BLAKE2B e5acf960c529038e9cbe3e35cb4290365ac8c7b5341516cad50466057764bb556b67a2424b55bd538a73207aa126aa1815d14057d109b696d379770cc6057337 SHA512 23f2f177644d7afcefc96843a821ea772318ec58e57a3e4d6c9acdcb484bacb8f4e79828bcd3347c372d28ec6946c8fc92f8ff652dd465d7e5a21c9b97b52f94
+DIST github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod 36 BLAKE2B d0deb13e3870c92583050942811bb6d76ea9a9166338ef27ebb9c210485f9e2d8248648fde86ab70b3bd4c6e8bca94bc54c3881400ae116a9c65d13263390626 SHA512 1890310dbfb0f686572f07b39dbd2d8559b8535702fdfee0302dbd768a6c362778795163a2bed22942d9a3eda488eb761e08443cd0a1c45e2885b276a235e349
+DIST github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod 35 BLAKE2B 5e1299e377856cd707fa70af1dbb083c3dde1d1ce9d8a25caf3b3d4a371c524127c2b3060d65e0aec6ada61a560563b1c2315a888cf38e4292b192079ac90805 SHA512 3a2d357bc6c7e558cf29e309d718b76f37686bd9457ba101a36c1b601abefe5aaf292fb9c81fffcc4411e6edaa51d130c875cee5b51368f758d26e006d7e9a2a
+DIST github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod 37 BLAKE2B 419c6e5eebd9f78b3e509972d55fdb5c0de90e393e15793a1f1fac97352758dbd5908bd3aca3169b8787b98d38d3dbfd0da3b432c271d39387607f30de75b5d8 SHA512 3910c0cb068e7633473069601aa57e05d47641120229e06ff0917fd4f34ca95b06d0eacbe6fc967fe6827f620779ae0494c4bb9479919e4f0c9a6c5315ff52f1
+DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
+DIST github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod 33 BLAKE2B 1f96bc7ad16794099334f84bd7b7760ae7eb94a4b32186b2d408e3bb424d19b22b3eff38a817c6ab845ea7c39555305bb940f2b9b9e83b342eb4169f2237d207 SHA512 5a17ebee3e4ae0212aa83c4923932996988a3a693d0ece14fdf1aca4193452ca43cfaf4bb6dcb78c3c7b996300ac285c503ac18b098b95445bb26b7c25cfd25d
+DIST github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod 37 BLAKE2B d66b4b477f3f94af0760263acc5065e51d1ec6a88ba3652b0f36233e6bcba3190c694019fc3fb5cb03cbf9118f37b9ab975eb6bc79adbdfdff419cf6a13aaf0e SHA512 96042f35b1d67dd01e7d799c47a7314b3d9c30cd318ebed4a55066c9c5d94d321377dc09ee97b64644c5132c0e03ac8bd7e856a38f1d694d31b94d88cb0d0f39
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
+DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.35.0.mod 34 BLAKE2B a8ad7cc7db547508bbaef19ac3461641de242b5af88ee88862ed0a741b721e228732dedb758ec1561257072d82a1d9b215fc66be108e74a1cb0024558bf86c27 SHA512 002efa297535d276e7546981ec33b48ff0dce9563f71e6525b72851e8a5e5a2eb286275732105ebfa37238ead31c6019c4b45a9526aeb655ba5dc54bb98d991c
+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.2-0.20191028172631-481baca67f93.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.2-0.20191028172631-481baca67f93.zip 103243 BLAKE2B d2c6b891788c76992a341bac41faa2a122e996dabefaab4f7b7dc72ac58d3595caf10c4bf74ddd5f061c50c980135f3264485111cbafcd4bdd2e4852efeebf6f SHA512 6679cdfcebce080fae845f593095967f7a3647775af6edad24392e73e1c21ee36c63d6cd534c482cb0d49fc40fac40623a77976778fc63df9f47bb56b6b27f60
+DIST github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200131185320-aec8da010de2.mod 1321 BLAKE2B bb81dfca3d55c545c98ea0b66ce8c94e9c6f8b0628bcb49b589d01a09770934a6c4252741488cfeb7cef9fce16402f6cb17061903172f85f19060426880983c0 SHA512 529b5a518bd3ad3487c13e3a02c4d9ac349d4a43024ea8e1ef5a86dbe9133b0403bbbe6cd7c16bb0b04865ad277315918e03bd179ecacaf54074b0f345121ef4
+DIST github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20200131185320-aec8da010de2.zip 813736 BLAKE2B 4865b2cec10f80435b6669334978fb934338c5377df181155d2563fe097826a629d33cf5d622bc9091f1f4a6f9ca1fe95c179ccd9515974997c8cac2a2fb3b1d SHA512 11a587435a1aa9d72ebb118c0c624b1ec87bc5eac9766e2d5349580069238122a495c18e4c9ef8e1d0cc0a3054b32ae51af579a4533257fed76e493296bf19fb
+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%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip 269532 BLAKE2B 00b678032e2b8c19490507c2a07d17134432313f09b92dc6635f222e7004e8c06f0c375bd0947e4638a2b04924317eb60f5215f40c9a459d6b763d0bc9598948 SHA512 318cb912ff414c874d69423d476ac797423076083de0dea926a5ea769f34ee30e065b51f694d50a69d5d8eb5e743289f65e7eefcedbe86919b7f2dfdd209e675
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.zip 1265157 BLAKE2B 50b2737bdb25664d13c7d0acbf5a678e987852a4362340cf0a98bdd7df4097180bdb46e36f601fef50bea10a6d05db3df081f55949c4e8695e748d6ed9a61ca6 SHA512 063ae6bab978ade9eb9ba9294b2756aaf592d15ad98e708fcf9aa1fc2be71030b13e0283254fac933713804d93d38252b918f292b47699de725253d72f08ab18
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 411726 BLAKE2B 6ee260803ad6b9edfa2cae99d831be8ca468f58463aead297358e3f6857b97503de8253b61e1fb9c0489526fa9937d6dbe57a50cebc31296d219ba7b834574d8 SHA512 413d7e0ef65ea9a6315a393a72caad1288b4b9a78f545d1bf930622404540af6550e0f3fa405ded6902099a271475d8196de7d5dbcfbb66e89c5fa1f7b2b41da
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.2.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.0.zip 549021 BLAKE2B 36fcc14703166410cd4b875e4aaf74ca6ad23da9cfd044158a2e647a6040cf8c4807a94201ceb710d993af3a80d18a6db9f73cc2d26575e20755333f3cbb6b0d SHA512 99aa6b94e0f9861a3c45061e6d7bf53b557e9b6a1dfd1736b33613add153ee4815d9ee2db0d856a86120408679ae9d38aa7bcb6215c1e1fe6fafc7e12d09c550
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.0.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
+DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip 20646 BLAKE2B 9a92c4a9908648db90f4cc1de9fc1589718d1c30bc673c6eb194c9c1d69ce8844e06e6662c61debd6eaf9885f502887c8518c820c34a7963f946a332ba6a04aa SHA512 d1e689bf8336bf6354f35a73deeda6aa22d80320f09b86adcdee153c015aabfe86232eb3efc28512c23c26e6761f9d3b3ea3319d2dc1a052e321cc76b5c59313
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip 9548 BLAKE2B 42b7838560a999f9e5993ddb0d2c56df785334d7a53a66a1165acfcdad1d61c74711f70963bcc606e8dc20635cef940e1f0f921310bd25731923be21d79d1490 SHA512 ab85daa699ca551b48699cb4e41e449f9ce46bc8921c7aa149b6148499e0b369d60df79de1568119c20cfbed7b2febd7ce2df3800f73315da3357b2a373d7cf4
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
+DIST github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce6703de524b07be5b9afe0443fc29a5783b21d6128db864da4239805d31eaddb284d33a411fe45971fa4a025d45981bd66b12ddfb404cd1aa21b1c26ed7b199 SHA512 c2e445e29a095bb36b58590a7c523bd9aef840bf4b224898e1f77bcaee8854f8ea9b9bfe338916c564f659300728e257075561830b7576a8d264e55242b3f797
+DIST github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip 7353 BLAKE2B 6725b6cb03bcc3ac7b7486f65b72705f6b484692596e24e7d906eea5d3309c49f10f70e6cbcc9a1c6fce89ae8128589be5d6ff5bb085f52178ff7d9e8949c1fc SHA512 edd845569ce3b01acb55f2c6fcfe77cde8a5496962688c91afb9237c49b17fc7cf4edce822100e7878f97ff77521d8a14e5b7683c2f2d3b03f1e7f1ef0606929
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip 20071 BLAKE2B 721bc6e9c5da0368495a107c94ef994641147880da54bc7e39a8497f3545e8d21b3cfedaf01aa832c5c964e2eb239babe2d40b9722f48415b230a69b4feb8fe4 SHA512 d763c2a4bf816b333da555a9955a4b2aadf4c6d89d0ac1c5b07a7eaf8792229a810a445995a42fed17aaa880630e834adbbb567901351e96757b263aa1616065
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
+DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod 32 BLAKE2B df722abe60c32d178160cf76ff7ae89eb50b56293c249efc435cec8bec1a59e1d28d93222409005b8d392284d6335e4b71c22ef31c7fe5c604691ad497d813d2 SHA512 5e6ee35cc01105d5aa918a8f43ecd7292e60577e7a6defd348b73b56716694d16d5aa08a6e07fa009c55942e1f2471f1a6e0bb82caf2aa1dc01ad87a6ffc8294
+DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip 680309 BLAKE2B 9ffce6d2099d879c7db987b356aaadebd9f00d866bd409127452d10b0d4c569e2414d4d3a6000ec0a5b879b470f73588b52a22a384a7c58303e51d34b475c40b SHA512 58c2e5a0a2b49dd9adfc3d59354859a44cb6b843b39b0f38328caecb5942f3e3c818117c1a187f22f572e9dcd05efa6b44d9c6897d7b136483d0c62e59f61416
+DIST github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod 31 BLAKE2B a4831276b684dfc8fe800df7830987c6c67d6466dc7f3d655f52d4b21ff302b7b570a77b6e059ed348bf42290b7ce440be447057dbee745a624fbc4c26d22cd4 SHA512 131b26fc52ef1ca31c98606591cb56e19de6275ece59880a9f2beb2ee82ba46158709a2d323d564d82a2edf2fe99b8666fd29c200a5d6b8452106883c3ee6c74
+DIST github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip 10753 BLAKE2B 8cf6b569c2e3697f991891e96916a45149a7b263711892927450709d5245d12bb653eb2b602dd8c748216d625baa727ed8e1dffb62cd15004c8cc0b1ac85064d SHA512 2659b336a8760d16b9cb7f0f417785bcbdb47be1a390dde2c4f1632588cd1170afcdd726cfaa0255c8ff81730a20833d424bc79383aa337e21446c67101e1f5d
+DIST github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.mod 34 BLAKE2B 355404416d6bf93bec25f01477399d925bbaf239f98d8d8e21e9facc882e3581e82f40cb4dda6d22f2950395c7c2f77d99409027fc8cd5fc9e8909df1e2ea279 SHA512 624a39b4a8d8d5bc8f68763a5ea31975ff36ce713418733b1b9fcdef891af09cd49b26e433378f4cd665b835990d14c70fad77df4299a9d009bc202186399376
+DIST github.com%2Fhooklift%2Fassert%2F@v%2Fv0.0.0-20170704181755-9d1defd6d214.zip 7317 BLAKE2B f8c974c38e984cd9312ca7e4c660d243caa02656c35a2b2599e140300f1e97de78e6bff4d0ef45366bffffa1af8e6f4884e009532ad58b47dfd942324f6adae5 SHA512 0cfbb1ed32fd69bd2663056dd82388b2c248d04d2e3be2c45a974e4ec42141cfb63a337447d6c07c27150d36502f86268aadf4a2ceb4bae005231c5676d95966
+DIST github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.mod 35 BLAKE2B 79b63912d89cf6a4172936738ccbeac42c062a4aaaf794e149aba43115869629f208aef4a73878fece3231ab1c198b1322cbb4118e2ab4206e96e9abd4c3ecc7 SHA512 49a1b18624e652b7e99c4bc584ff52690d893f3fc077716c3546d18eec49a2b4282322cbf2ebb7cc3a12b8cc252ddb462ff159b5f18263107d58ad1de7937b41
+DIST github.com%2Fhooklift%2Fiso9660%2F@v%2Fv0.0.0-20170318115843-1cf07e5970d8.zip 24320 BLAKE2B 8edc26645067f378544a60fdee5b02a90c41f5d1a44ad1ed2619f9c2e684aed011ce2367240400129366dd278bf37b67c81905360d807ad28ca79aeea8d21187 SHA512 e79e0d65f7e4879f7c0b9abed6f68080c12e1a1b19cb992190a4fea2a9402cf3dc10ecfa9f080bb6c8d7ec3df068f048a8ea9f8e58b1dbf305c0196e4d93155b
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip 25166 BLAKE2B 6451f037f868e44e6a478811061a0a02be96d5d9c05c7275239cbb23aa4e70c093d42a11b042c4160f8200974ff904a73db450d8112f328944cb42f3c5c62c31 SHA512 d87144fb20e616ae224e2fe41f21cac8b4bb6fe2210edbb5490a2193fd5d76d4d5e7d5039ef2c6a6811850e72d3449834f0209464e7933dbd18773382c0599c0
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.mod 33 BLAKE2B 6edb22c2cd99727ca9c49a65c118aba3c8d7fbbf1ca84194fb4ff4f7b14a66ddfc0926008250065b69b055b3ec23a3d38590adc5f797b95873a632420b3b45a5 SHA512 8c330619897be06e1aa137c8843ac171c843be8b021f4e71cdeca61a3b0079177625993a5e2bbd8f8e85815bee7e07dc177111b76c532b4b80eec891d52a88ab
+DIST github.com%2Fintel-go%2Fcpuid%2F@v%2Fv0.0.0-20181003105527-1a4a6f06a1c6.zip 15851 BLAKE2B d5f1254a6357d7d3110ebbca10eab15028fa6c5e1e2166c08b488bb0d1ba0b8cbf8c011192169cc08def118a338df2d0a2141474c30be5a9b345990d725b898a SHA512 cecebc015c5f2beed4c4e33ec3fbfd796ead89f8247c1d7b0203bab2c1f3e76b042c34cdacbc274d92bb9a9ed3df73b18d8ae5aba919e5dedcf2e60481dd86b3
+DIST github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod 40 BLAKE2B c5cfc13138ded13b58e87927dab91ee13e3c849559ef067ff5dfc7886e454946daed9a9c916fc33e7ca2d090ba3e20b66d2b3d5cce1ad52455621659ada6ddcb SHA512 400eef69c141ebd20b3b38df86e95cceac1cc214b0ee7837ee84c6c0acc96097a459add9ff20622f1fc7df10e7c525fbe1b573a0b0e7597678c9a8ebe52bc564
+DIST github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod 47 BLAKE2B e328f992c0ed374c9e99019de7ea3c2a5518485eb7bf4dc5e66ea5525562cefeac2a819f649725ed99145ace045c96b88623ff68c67025cf18ee3c6ffea1409f SHA512 97341ef3754232ba8bcc5367bed29a4d6082792819ca35776aecef0c43c3fe8f6a4451c7cf8ea8b8423203443dfe5662066316d63912055557fbdead7d18da9a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.zip 231438 BLAKE2B 3441c5935f2f495a78c9f80dcca293e8c08fc8dff96a85dba673411b12cc03af2cb8b363c2cea07cb131435063e6f6ecf0c4e0a59f6060ff66cfe96466f8a96b SHA512 5dfbed7fa77c3827515f046923237a17c1dde62275e2365ec599ea6dfe4c93a1cacb1401c5d36f4379e4d80425352abf67ae1a0b25c7ebfb974256cc9b26d983
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod 90 BLAKE2B 791f2fd579b03799316c3af8db98ec4cd6d0c3bdb61de048283db2adb413b5837f569773c977463208afc44324cc6780a1a2f29fb2ae87123eb6be0fba89d364 SHA512 678595cd445e0e9ed94debd2eaf5412c131846f92a78b9fadec6f8368be2a10b7467b2d5bb55def3f4fa0cbf0545edb8f32e27003303eb550b2d2af72a55a3c5
+DIST github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.mod 46 BLAKE2B a740adb19f1d57020f24d6c8ade4dc9d2d86d271037efa44b140b8f2c128d70cc4b29cbd45d1a6f23f2341467eef4e94aaa1402efeb1946b9c4a0840ba3aebbf SHA512 0d0838f5b9939214c3e0344a1932008687ee14619e79635269857f724efbaca63b6d06a668d7e3eed1c435e76b75bdbde7b007d870d1f1683d193a9288e8dc08
+DIST github.com%2Fjohanneswuerbach%2Fnfsexports%2F@v%2Fv0.0.0-20200318065542-c48c3734757f.zip 4998 BLAKE2B a5bc8afa745af39bbf7636f87af597c13be3256ed030e651d43549174d724c852f169096540389a96e49269f0e8df0b4978bf76fe105c12a7ed59622de6e5936 SHA512 11a98b34826c6c26ad06e291044c750383765744d9b2ec10350ae0fdcafc4495b09cc42b2f25ce719e1d222cdb6e32179514e1bc0193c3c6bb179dd78d0048b9
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip 130029 BLAKE2B d93b46be80649fe8a93eafb6d1bf323daed352a9502bc00034da2bb868b757a32ee2417d0c1fb4f79693f076317d98c35987807f4823fc508043115aa3646a8b SHA512 ff2823c8371568a825075309054e424816e45c0242efea76d94127a72b875ff54d7c7f415bf7aefcb8f0df0863f56d9288df64869edbfba29fb15c693f968b17
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip 133348 BLAKE2B 1b5294c65a6864de4df7000935d365cffe1112d6f27848703cef467ae7f962a3c5c5ad22e5f67f25810a2ffcef5d4ea19b2445cbd67cf0f0372db0b1c6c162f1 SHA512 cdc9e1759d68c8c9a64cf6d1566a7d30bb90151d3a7ce3ddc9689627b53056be3915196cba74823d5f7d8c50fe05a9c6a96f8e7c26d2ed17bf7f1b64962fe050
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.mod 29 BLAKE2B a0787e6cb20752436f83f6b7ba857cd565a50d94d8068b54abd3516a93b6c13f8bf3f7c99c201776a338d7f5371e2ef08a6bf58510da233e4bf1c1f7826d1c23 SHA512 49d26384a8f7f031c9defa414266479b4dd2d95c2f876374ae1ea86856a080c836c129138036f98952650301ea4bc18e2242d411e35c7b539099f93f543a25f0
+DIST github.com%2Fjuju%2Fclock%2F@v%2Fv0.0.0-20190205081909-9c5c9712527c.zip 13280 BLAKE2B 93eb574f1f26a18bed2a2326ac7cff03b6a31f3d7af928843d2635c970bd2795f1df61c85179dd5cf46bc878fdeefe02e5c71a362e5baa08b71f282d4a5ec6db SHA512 b84c955b7952c146a50102897a3c81b24fb378c285afb99b395fa60eb27e2995b00a1e830ed93b372477cba6b6e76c4278381925759c287966ccef14e8cf45f6
+DIST github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.mod 30 BLAKE2B f0fc0eb010769136b8fdca121a1581e1fd3c118944ddf37bbd2353295cbd27c79ee7a37a040e8962299fa8b1a57c838c572a07cf5e50c907cf066c3b17cb1cd4 SHA512 f97b798a5ecc3edf5fcb0698c20ad0d52d956794b271b21a5c0c337abe75b193459048b3464c851746c3aad896461a2db3af4e7a3432fb2df400a167c30a9e48
+DIST github.com%2Fjuju%2Ferrors%2F@v%2Fv0.0.0-20190806202954-0232dcc7464d.zip 25819 BLAKE2B f7d090eaccc75cef83748ff554057a6871553d5bde8cf851e43ba071e457a159391d734748a6e7db01d89ee0040ffca4c885d7a4f6b6da3af5bd85d374864cc1 SHA512 dcc68d98d5d4fe9558fd32c2561a52d605cc7790f27891529319dca5e055d8926db1608f86b9947352711fa62beec6adc71f17912c2293c822e5611489b69541
+DIST github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.mod 29 BLAKE2B 5a28f36b46dc341293da50b734f59bcc53c0153f0ed52b6cdefd2a3edd6221934b8d54a827fd0f5a8be9794cdf952025e91f7cb6e8b58b053cbcc5800581f2fd SHA512 ae6c7ed9b6a5316e28d91ea5108c804424fc3862755ce2c3d537a204b4ab481299aa664bd45363388c50174f1d733b205bb9e0de2ef87d3ce915becbca6f3f5b
+DIST github.com%2Fjuju%2Floggo%2F@v%2Fv0.0.0-20190526231331-6e530bcce5d8.zip 37301 BLAKE2B 898d82da242a8dec7730643c5cc7add800d0744e00946491b655ccb94c1bcb45618c65cd7a1ae2fa63d36edba4205b0b2406d2c90d963d9879c6a8156ae48688 SHA512 c2a04097199ae80fea836f068fea8d23ee8f34b3f4d592584c3949f1bbcf581faa3124c07ceb6a7af55449adec3b171997d33880a581b07763f0e44ad50974f4
+DIST github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.mod 29 BLAKE2B 6a1fe9dbb73aea17e0af65b949461e8af4314fb21f463fbce277259588d39f7caee97c62ce1b2309a8ad218b41ff59199da0791d4c0f7894aa51aab1cd33e046 SHA512 3085f862c46436448525163835a03051cdcd791b6378c99aad1a79125089bc21d31ddd3fb433aa4dca24c9cad299c5822408748983aaa982c421cf21cd1ccbbc
+DIST github.com%2Fjuju%2Fmutex%2F@v%2Fv0.0.0-20180619145857-d21b13acf4bf.zip 24204 BLAKE2B 173b094ce53b523cba2b60ab617074d66d61a0cbfea2b4de9b1285225bb4fd1c2b88ade02b7fb627d49a70f55ec5b604176555e9af3f97730d5bfef858710a9b SHA512 029cc2a2153bf7ccd51d25ef4ec3a1772756727663df664c1a353a7ce0645224583bd3ec92886a1fae7abbe10d62b787f9ada86c6a24ea994774f3c87f3277d2
+DIST github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.mod 29 BLAKE2B 4dcfb5ec79bdcfb6142052cbfa00f8be5bd298efe3ac056cb7970d79ae47288c7c7dadcf1f141cb382e62b2e4e525a98787934a37fe19d2a01eed55a4b656fac SHA512 a7d0a723c81db4ffd170eb2b831ae53c27121cff8d76cae254e7d0595d63d94ff2e371f9eaeb28378fab1309fb8065ded1146490e5bc0f99d89b03c81c1cef58
+DIST github.com%2Fjuju%2Fretry%2F@v%2Fv0.0.0-20180821225755-9058e192b216.zip 13809 BLAKE2B c70b3d31cef1306163afa9502ac9d929558236049f0dc2bbc3dbdc6a21c1c5b3c4d6e6f17c1194d1af48abfb8ccaf35fd49321bb8ab719ed9c78b0fb6cc99238 SHA512 aba50f545939401dd274a45814b2b95dde2407995795e50a88d9f283d042276c9548d568d115b1f9366fe3b825852d32bf6e723bae17958d12cbe61e11421e21
+DIST github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.mod 31 BLAKE2B b0302ff3ab85203c266e1c0df16220fb21e8e1319bd6ceac6c5a3e2eb6db69c10b4c8178e5ccff922daf53f56418d504babef74e15540a75014355f84f58df5f SHA512 75b333aa1f9246447e0a85fa3584afb777eabe6864b51445280c3c94bd2377cd194d532d6d119e9484b5e5026e1986f5b5dcc2e4e17ffc6b5c8dea7238f61999
+DIST github.com%2Fjuju%2Ftesting%2F@v%2Fv0.0.0-20190723135506-ce30eb24acd2.zip 91639 BLAKE2B c9db4a8276d505eb16ad14278d770d2dd15b3190b8e2d6fb660ba4958899726a902a6faca88711f9fcc4809200dfc74a7753b876868bc7f43d931c1d54c40b80 SHA512 21575b4c62cfbcaa22607ee8aa4c9781a9c8bb1595328923d047922bde5cea26480b8e35a36e6278580c1bc6affbf1b04a64dd367ba706f422aaf1d0adee60b7
+DIST github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.mod 29 BLAKE2B 6f33a80848971d3e7444161c1aecbc29a637ae936b1ed17412bf6cf994214f81aac709d8b240ee9a18a98ec164f649ec49392642072156afe5ae36bbda26c32e SHA512 9fc3e983bf6c9ce72135da71d2e945849279b293a8a310ce85a08182b52649aaf5456e1ed7df26f570a5b3697d519adc50f8f5c6654896248a34c7afc8d73178
+DIST github.com%2Fjuju%2Futils%2F@v%2Fv0.0.0-20180820210520-bf9cc5bdd62d.zip 314106 BLAKE2B f1ecee31c85abcf51b7a67f967a90d2230760df243cb95bdcede14cf0226de9857c08a15d8c34cd521043df123ca1a2cf802427836302808351b72ed16509bbc SHA512 0a090633744060b8fdfcadc3d71202fba46f678d7a06961cb535ed6ad1cf77724cd2403235c5fcf7406ac11c491561ff35453500b14cc0dc8d0c0bdc712baffb
+DIST github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.mod 31 BLAKE2B 11d5d46fd6aec5f6730091ded81c8ce59674d5e273544f521444a90ec140ec5133447dd63c7775af9d1c2ed02150851d289ec336a12b37efdcafe0f29a9a40f5 SHA512 9ea097c2fb90df92a16b8eefb08000e81b24e55aee12f4a5dac159b67f5188556699b2a7c34c497a9759bd5228b4cdc5cda8f11406795b8b34e2f69e0003b013
+DIST github.com%2Fjuju%2Fversion%2F@v%2Fv0.0.0-20180108022336-b64dbd566305.zip 8568 BLAKE2B b6c4d12b076ebf5ac2f363f306a060309c88d27bf5569abd6951379c54bd1f134d9de15899f5783588f258c7ffd5201062f018212802d26cb159b565f7a47a3b SHA512 fb3243bdb0c75c02da646e21927c6ef7beae9cb6baa7e459d265f95646a36d44c453a78c9ef737a4713966c36bc7101b194b0726b8890baaeb670140648044a5
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod 74 BLAKE2B c12920e4f3f51d17f6d3349a0833623766ec6a3a609850db89372062a02ca712e3080ce187754a22ce45ebbf35b6d4e317dd6e5a4071d8fd140cdd7a6b09965f SHA512 407f46f7cfac9c4dd5feaedab0f708a9ed13107091a15251dd4963cc2c32290f57614d4b5b0a371dc9cfa8ecd49d85b13114d635e1176d56782098e8978cbfc7
+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%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod 33 BLAKE2B f8dbdaafe3a686fd557b1e1dde2a10402c841a8095800b56f4a0cc180befd45bd74de0575a7e90b5202bc50faee916196baef35d80f8ea013ddc78ae416af6d9 SHA512 3bc77706ea4909ed01ac069553bde55024b7bfa1612f5065a477d44fb68bad00d7254da1ef978a1518b2704b507ce4cb360571735905c39c7b97fb3e21c64422
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
+DIST github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod 45 BLAKE2B 694a8e11e9049086a55e8072e2bbb5f40d662e5d81b5edac84c9f8b763e47cd241a771fae16db9c246156be7cad7dbab75f7d9e211c2520f61a1e535991cdbd0 SHA512 6ddfd83d7d8c13466f4164f7c2e098d61b0ca22e0ba7c7250f85c79cb68df41ee4f2d2ed3a0030483b1e6bb11b5bfa66474c65ec68579cb037690f31fb6d0243
+DIST github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.mod 37 BLAKE2B b662acd60df5ab7f01222e1e6373f5c5ab77c4656cee97ff06a4e683dd5aabefbfa9fb8d1b419101e663d8cf441c3c0928ebf6efb6df9ec40f2405402c7d8e51 SHA512 d1095eda0434e4425f61fc5112e7401cf5ff41aa745c83411fc290d061f9c811383b5b8f064e5797425084febd6a7ad41b5ba4b97720d39bf3fa7dcb73118ef3
+DIST github.com%2Flibvirt%2Flibvirt-go%2F@v%2Fv3.4.0+incompatible.zip 185830 BLAKE2B b0102b73502b2e5b4d441c853c00ef213568fd5f78806ed3fe486c6ac515d7808110952d2aad5794feee9ffce4e7d74c023eb75d5740f51a67e3647970ae956d SHA512 85843e3ee206af598454613c85167a449c252edd6b2a0d3aab34f7e1f04749d1aff9d5d3a6217f7bca2d4133cb523874c0a72ab53f35cb521d861031cb53c095
+DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
+DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
+DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
+DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip 4250 BLAKE2B 484503f721dba9b17548c3f6deec7f392e1273e8cc817da885955b2e98a56c2d075ff6c2e4dc340edd4b241d27ce2104607543cf51a83846d0899c382deb032a SHA512 716663149e49b2ac5aa75c4cae45942db1f34b2b42c5a22ed317a78db0f0bd9d4e00c1272ecf1d89d07ae77f7abc0e5b3dc9e0cb268751f93c2edd4f19832657
+DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod 37 BLAKE2B 400e3fd523a0995770046676b3a848d776c64948653c3730929e39e0c0a9fb2ffdddd8405359f676375bc506efb05bbb9423af6b6674d16baa16d53f264d64e8 SHA512 37c8088012b54286571d11de7e6b59d68a0c5b79542c35c31c30187ac3586f57466354498960aeb500226d740eaf62601ed6e569ee82039efc546a3bbcc7ec73
+DIST github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod 31 BLAKE2B cb93818128243477b843ee4363e3cf7230df8ab9ba91dad64f17140ed0f87ae9d18e825a375c2afb17f93ca1b7f9242aff3303cead79b28c2eac6a4c61cef79d SHA512 b1f9cd1b5f1d2af2937a3a6cf94506800b5d8b06177b6690dfcaf908b835e76a77b20adca81c81d9ba90665ee338f870603caeadbdad9338a914465f2f0b1fac
+DIST github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod 39 BLAKE2B 07249ccccd0beca4bbf154afe82f9d9aceaf8de0ab108e4b5fe70b4b7278fa46d508ededb43186f08d4765dda4c5ec284e5185639538b1a1af517b8b2ec134b8 SHA512 96872af243d5c2c1509cd28cf15e7ec8626cf526d422318d160114526d25fa20a49f2430c62d4ff29646c7115078c86cb9663bb81ce64f99b5c6be4fdc57484b
+DIST github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod 55 BLAKE2B 2cdde5cc70b28c8888c9fcf680f5a0c337a34ef311e82dfd9321e5bc52a386ec952b1ef0e12b089a3112baba7744bac334a256ff4b37f8db97222a504062a32c SHA512 fb61bf01ac03b06d330a06d6386e48eddecee52b3d8801916077a541655403df558881f16da04acc75004cd18c98ef3c5d29482b6ccf78859febc6ec1937275a
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod 698 BLAKE2B e549ea40544f5c3bbcae0e2ad539b3372436419824857fd933671da67060ef1821e8f0c2b82cc9f144d9c3bab34dad8bf32b61bee5934712965b19d6d2a424bc SHA512 6c9b8edbb34638c032c635735aa772f9c5d730a05946a05497128e38b2a900e9c47b68d5d17a3e047a94321e72990ab662027bc65af48f94ba3af23904034428
+DIST github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod 54 BLAKE2B f70b125bc544cb6d6c58801f2e8591a0ca93ec043528574fd816956889bf87e90b608f5eaa8037503211d163d27a9414cf1247384e89258baf35c2d991a62c7a SHA512 5d128c0c307055962f604b6f6a963167909941da8871f06b8e1551efcaeb72ff44f6538d6434bea546417df6b850cdc1e48dd051d04b06df9a164322cfccefad
+DIST github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.mod 63 BLAKE2B e2b7088723ad0703fd72395e889841ae9a755216a410b4a79ad54f4532978efb24a9eca3fc87808302c1f9d160363b439726350dd52d4ace0a82f3ac3e717726 SHA512 08e4bc97c8f84a7c81416af2712068bd6070187418e8d662628000602297f11725c08cf7e681c2879244179a9d7ce553498f9537a645df149cee4d33f1ac8d45
+DIST github.com%2Fmachine-drivers%2Fdocker-machine-driver-vmware%2F@v%2Fv0.1.1.zip 27808 BLAKE2B 6b1df2471cdce9397669eac4462eba5b2ff6751644eb22c71dce1b05fef3da5449defff76c884b98ae5d9cfa5a787e99ef49adb319a907d962ba1cf7ba855215 SHA512 e8baf8196063fe6565b9ffc85b58e122adccd3b1878ac80eb97d4b52e12df4c40783c61852f816718803c4f570c4e75d0bb0bf69045ccceb4d168ffeeb9e3076
+DIST github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200323212942-41eb826190d8.mod 42 BLAKE2B 07a6464b5d731477608d89a72be6966134f6613c2a23a453f953ce66fab7b676f1d13c2101f60be4f5e0a247c57a25b6d399f02e1e64dbba16eb1e8029e1808a SHA512 0f52acb03f27e332b1a7e9cf363c3751a8ddfb70991273f3b7197a9a76e66ebafc8ad70e0cd6579f85e799b29797a1d2cbc74d66a59b24b4f70c6f8f9dba5f33
+DIST github.com%2Fmachine-drivers%2Fmachine%2F@v%2Fv0.7.1-0.20200323212942-41eb826190d8.zip 434787 BLAKE2B 6ed130a94ec824022b27b40a9fa975690a76446d5df49a55b22dca6cfd3317ca890790a9e4b37b6ffa90216637e271bc807137ab7829a0746015370a8478d119 SHA512 2ba65232abf46f184ab25e65feb317e89c81972f1bb98ced097a91ac5e8ee68b4847a29837363ba5ea6dad60f7963880d81892ff3566b6a6005843583078ead4
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip 38603 BLAKE2B c0b783439b139f5df0c9bd7654e4a85b5eff2a37349f0c68b713a00018764ef355622756e7ed23d9eceb3201c93e45d0c0f7a7b17e3ed27dddadf523e79e7a89 SHA512 b10057680da719464890d8bf7ae3c3d375c9fcf6ff833250eddbe897b9ef68790bc5e2d4cc5936caa69cea311999263cdfbcc71431839df8214f6b0a1d1fdfc7
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip 39235 BLAKE2B 29ca5b93a76a4547abfb2c237f832e7545f8b6f74c842644ed3d9f8f56ce6d388eda0c62162d9338dddb827dd09962e1d28ab551461f07fc0801899d6035b8af SHA512 b5d30c117750cd3fc87121787792c3575d53404b66e8095d1d6913488b0271c8372b0e17001ea320b5512987ad68e78479664a40c25f07e9f783fd54f7d562c7
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip 68804 BLAKE2B 1949c9647b1c50741905b2634f5798f57e666df93a6a588b36dc567c4370e5dcc8b6a281780f178de7b6d9e1bcaafda46844605d7cc53c2f3cdee7ed9e6720f8 SHA512 804570fa87fb574d4942c649c00941da987498834951b5fc6bca367f3c17fcddb714656a178daa46ad88087caf97243a6d2c6d1b3392b36f4c72b2b1d2f25b7a
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod 169 BLAKE2B 2c00778603b181f9f14744bed2bbe1927e8f51a3ecbb49d7bbcf7b51fd5ad32756188708203e4319b9797c45a2488602ded332e56916b2b2d91bbb75d57920cb SHA512 f09ad6d4d7b4e53f69ad31b50c934a3534f68887c1b345a41bbb356579f217c2fdb482dd305214452e201b924e5d775a81ab3e91de120fee3119616a31a59da5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip 12177 BLAKE2B 8089c6123a976fc954dc76f74aadea87031bef339aa263aa38e80d3f3ee0fe87c58d9986b2961e29b746618617e2cb6b2cfbacb5c413acf963a2464d36dd0bc0 SHA512 54509ddbb3aecd1980215f73a53739d2f3c757daf67c78e54c508474678cb5df929a3b8e17f8d2b66438c1e78989a2268db2b32d6a0a6d5236abb6936a09ac04
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod 95 BLAKE2B 21f86775ef310fa5f1cbd773890d231e9dc64fbf2dfabaa3b7dab027f5cb1ee9880adaadf6b8a9a2b181db838e5fe26d7349442b591d925ca24ec7788d887ef5 SHA512 64b61a0f9ba20ae004a305963046d91b7b66e3659b67fc15350a0afa625ecf4892854e1829dabd589482d844a248aa73a56dc970784f2a03f6492a0010c5c665
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip 7953 BLAKE2B 4e5326c0428607298ff2bfdd95883f62e3a6879c91c24e7d90f86419e31c69cb857a3a456272f2faca8b66dd47c947d460f758498912522c31537115ae3a10a2 SHA512 301bd0a1869fa6ad2e19b419220c612ad46372cf6c7a0b8348f0e9b57fa239ce195765e6e49d81d347ba2000e029c348aa69a77a237c2466a2dd4ec369232f58
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip 19130 BLAKE2B 85321c6a52022df0bdd9672de52cb5b7c1a652432047d94c088a71d612a81fa71d0cf9fa611c713f8f57c4e540ee0212223e987eae040e95014bea07e135171e SHA512 9ea745a6ca03c046d7b77707616fa756c01f58862286fa9805e99e3a0090be2fbdafd763f432f3c9ca927518db73ee0ef74e0b95248e515f50c2c2c1d9b14065
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip 6666 BLAKE2B f8b1dc89e5c872b76d4cfa86ca5439e074cf15736861f772d0a01d195ccbdc71f1cc58756e403ae13784d244c00c38dca27619e5b6d1039a0840380e0c13bbf1 SHA512 db1d13b6e07e68a5a0a131b6d2bf1b8d21c25d082d02e911b01743b63819a9b8c558fbb929e8803e68d6b7ab3a89aeb0b23ac15a345cd1007402f0a049c831d6
+DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod 641 BLAKE2B 6665ac44958305ee1c0ca00235fe5215eb6db9cddea473c6f145e6c22f9282fc328de0f094aa8ac7e54235df27d41446a6111477308cef70f70ce220f1dc1ddd SHA512 f236fb50f69baa342d8ee88f40a9a74324beedf8d3b1b310c0259b194d35c360aff3e43fedb3b17c8feb31f85e3b0ff2ffc65f31ac4cdad08ac154d968d4ead1
+DIST github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.zip 83936 BLAKE2B fb140c67082c435f6e4e66186c901452774817f4b28847a3d23dd0e38efb013bf1bb1018ff60aa69cfe104f8be3e70ae1d2bc7e4a91d9976b70633fe218937b1 SHA512 4a0c5303b39f2939d8aaf38c3876b64a74a429f9655b47758f0e95a895755da5a9cb243d6490c5b357f7fc57ce7bbef04a0b5e8be28551b5a39860980126f328
+DIST github.com%2Fmesos%2Fmesos-go%2F@v%2Fv0.0.9.mod 33 BLAKE2B c2ae3fb0378f569fb65273b84ce9a1bfc018fc215f007231e174b35289617d0115440adef419fde8392d6f6a4af42b50c5e0ec1ea751130a83554420ecb0d885 SHA512 638ac70369bf89f7a511e8c8407897921860f1046e9d99ec285b361720647586bc2bd47e1bc9a1cf382f477373b82caf29922b9bda1fbb875c501f6de4723310
+DIST github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod 614 BLAKE2B 07f8d5d9117c11075001dc82ac484517c58c91d8b0b50f8e7e3c060889f48492e1992a5e67847fd24e1e66508856cd3805130d3b9b99634611d710a6ad010a28 SHA512 0663fe301696b58912d42ff5619acd7395131e70c7d8f2e02b9d26e07e2f4736e7bb04b7de29929bd1155563a0fdcddfa4e74b141cad42b775ac279ef9d2a83b
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip 204894 BLAKE2B ddbeb3fd06beb22a0f700354da94c48d26eef81040bf09ea6a56d1f80deb38d510fc5e53ffec5184effe47e6be99bcc58585d8908f9b3ffa5653e8b4d25bcbbf SHA512 4bd2cf57f6d5b9ad9476320bd9391494e9ab1e69da141e00051e54892b9cbc8f7fc8bcf7c3f869371f588d4187a81cbc31bdec60202fd262bce31f50dcdba914
+DIST github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod 36 BLAKE2B 18ec4ace4de7c41e3147a0c0b1e2fd044434216707275d2a3db0da6f072f6d45f3c5a451050d4881cd0a684ec2ee12c975d94bbbab68865453b08339bd4169d5 SHA512 ade92d48e56c72c2260143b7d9e00437e55cf825a2d5cd3240fece4e1c01c77a97d7b2b5db4227112bf656b402b91be3cfe4d8890ab9b6873e2e828da1615d50
+DIST github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.1+incompatible.mod 35 BLAKE2B f74f76885a3c86b832d1e7e80ef9d282c27cc236a3e48ce3bfeb10bb5a5b2ee0820adcffc89c0e30b7a27493b9ee8f131cb5a151baf9c1b7edc8845d30fd4531 SHA512 c5cf4433f35fd5795d64388816ffe45b49fb7192c2c7bf4fad21e680cb35bbbbf046945c48e3a6e1c3d8cf528942b5c2eca85de9d8f70811d910c4624b53f2bb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.zip 12605 BLAKE2B 3252b4a98bd8d0bdf50cf437516d4f80ad8941d61f824bc9b4b04c8a479d1873d410c779743d41a42dd24a2fdc0f9604a10e56a5d8d30e1d8dabb9f5fe75395f SHA512 c5c7206749683c13330befb9bf897c82e649ba90fa6ecefbd7610bf8ef323ebeeb1b4015b56f4acaad32debe8f29f3e0cc827f3d67acc89a8ceb6322c05db2f9
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
+DIST github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.mod 32 BLAKE2B e75ed6c922965a5573dd6c764844f8dfee66fd5f9a6c1b4d124168ecf1e8158bd39375c9ff3dd9c6f304fe59380d60b1b3449a420c11604ce21e427cfe284f25 SHA512 3df45579db0242febe5834c76ee82104a85b04750e1bebc32dc7fbc7ebacc371ccbdd9ec7d692e3c0222259fe9a6d89656143dc58664bf3536f0bebcc836d212
+DIST github.com%2Fmoby%2Fhyperkit%2F@v%2Fv0.0.0-20171020124204-a12cd7250bcd.zip 706735 BLAKE2B 1706d32ccb6b4352eda799bd08c7a3208fc137a91dd5000cf1f66135cd2275f1ebbcd013b3e148d8705446648ed54ce06f73fbdeace702837a5e5861cd16d011 SHA512 f23d052978c1c09f2b13c5253982c65b477db2c6be05a391ad616c4973db2919cd280601c0cbc1fb47296a36cc75539d779b1fc63109fced14b1c58ec964c788
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod 33 BLAKE2B e0ea5580f1072ea92da2932166e0e9b1aa9a68fb1f2a6d99d11f74369437431c205c2bc9282f54217f3518b828988ea398a26d7d0b0184d11c6bf7daf8d96775 SHA512 1a35c92a5df7744978b71fd312a0316cd1f6c3c26f4c83cbb61a382cb961590b6aafbb101855b5348596b33796d21f151c9b6db57b45d5056fa78c1946d0a946
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv0.0.0-20170113033406-39771216ff4c.zip 57428 BLAKE2B fbf4df5732ec592055be959bdcdc61cdbc34d7eebf9943be51f373c07ec454cd4b69ffbaa29e05207765e9bb5e7f2f96ade50676e2f855d9140808abdb37a8c0 SHA512 b1ae387299086dc7cea9482ef991a5f36cc68f4598f0fdf179ab4d3f774632cd1130a45397eea2dacc0c7fc92f9491d0827e6e666c1f64c6dee0150d58f943cf
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
+DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod 42 BLAKE2B f2c65eda4f8af83b8125816f597f32de21a2fb675e30625c135b92fa603dddab4a253c6151692859ef24c4a4a4b3d68d5dc0506a07d2f86ce28171ca69db1982 SHA512 46deadaef6abd1e87e8aeda576aad66d6b8b49eb95295d6e036197884a4f9564d260a14bbc667bcd646c6fab3ef8eaf2c4307ffdbaf9403923e5b98c5180aff4
+DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod 36 BLAKE2B 787cabe805d9f0e03a6271f517cb58f18796783b308a50becd1183382cbaeaed9d55f449a7dcfdb22c050859a7654dbf0131be32e36a3974e7bb49f4ed70a2d7 SHA512 61796004d8b6e98d8dff2423ea5bba89fbaa36ca91640957801a079c8202026945d6c3d1c37acd09a8e555d7c17ed03c3a8da4e2691f3046ad0d39fd4877c101
+DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.zip 8437 BLAKE2B 1cc6dc7c5ab1aac2dd98fbeb34bde77b721de93f3ab6908a957a8b77d4710eee39c3e2a5d6c5344cbd5fe50e35e2282e8a82f263211e0c20f6689488bb0e02db SHA512 f2557b04f63c5fc36236e6f8bd18efa1236f3169d1006306bd6d317e1fb914d6d24e402021479a3023b43d64838212615ee488d3d0b114c3d3a889e25c9215c1
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod 30 BLAKE2B 7fb5410d75cd091a009b995b47410e8441a7dff49dfd7e65b67985213070062991cdb598cb32d3b7ce3e4662b97cf892be89468a07ce344f2032e0fd34c8523a SHA512 38f9286cfe50682f6b466377b05271bb53db493d1b3626bc3567970b5f948b439c8c46f2e9be88b199bc3a7c600553f1200c913ab548fdf74c7c6e8cddb1dc9e
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 8705 BLAKE2B 905de677e6b1baf15fab1e19177c6f45f7b84aaa1e6426f8aa1c9c77d81b491d4c334ec542d45729e380017a91619b99c8e79451768b1cd9bacdcfb7e9e0981b SHA512 a7983e1a07e1e7fcb047ed7f210cc131c1ac43f4bcb1863c8c17f557e2e2f946624d793e8446632ab127d109ee5d8c1de96f914d6183494ec46145ccd5e75da3
+DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00
+DIST github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod 30 BLAKE2B 6389fb6d3b047300662c1e3994cc8bd35bc62c75ec45fc5d7e728bc1b5b778a12ec6fb94e71a4d4022d86e929bbfb9f48eba2459cfc610613f9f96681c9ebe32 SHA512 e4468fc60622384862e3dd158d6646f63c35a7bb2908146318f91565a58b5aacd482e13e3314888ab0d066ae2f24de71ddd9b1b9739b49ecf711d47ad8159a59
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip 17365 BLAKE2B 9853368adbde2a0ebcc9666dfaabe2c1dc45247d3c5ce48553e70afbdea58b865ab63e755763595ac5cc13ee3ad6b33a226dceeb08095b22a16f26e7ca8ab550 SHA512 05be92fb57c9b65909d7b37e7ada716dffc3a4e71029e40e3d03a8a5a14b74e57a0eb4e79813e23ca4b8e102a829941b33496495fb96a6b953e68ca9bee1e1cb
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip 24551 BLAKE2B 4b7736d36b9c2b2d38decacecef3b6411e190d6504caf1376f6adbb0d4458889eb9c0aca1ff936e0223eaa26c7cc2e077671c490f998e071a6e63cb7645580c0 SHA512 bedaa028d6450dafaa54f17c444b8d2923cbce008bdf73ca442297793b1b5bf60e829cbb6175d5b24fcadb8b91470e07baa369180a61d3e9a43ccee5ba18c150
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe337fee8b519154c18aeb568da73186d92e7cb122650e68aa22a728c04b91992660a8626c78be5e5550f1538611718052348a2a760ad040191ef2 SHA512 9269de68436cafd9f729f88cc0b8775ff2e94a7ac17f691c4eaf8e2645808558797937b8f1de857122daf2e31ac2a2c13d5264085360530b3ed09bba40f5081f
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.zip 244154 BLAKE2B c770944d112fe8352d48de60bf0ef0c656008eefbe1ccd0e498e3f129d948a77bb625b6f2b7f9b26998774bf1a5490d1106774caf2171e7c7d2bc3a8e2338ae9 SHA512 fba02794ec34d0cf1083c48373889c62be424b5b0b63a614d64bd03718bba0cd928fa5d6124bc71ac014c8cc8a644861e0630bbffdf56295e56c670fda919e3a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip 241037 BLAKE2B 6496c984a58729c6d0f0099f22d1dbd9c160639f3eb15e473a3ac62df5c6bb3dd6ec3a70da85c75596e28c04d0ecbef7a2e3ca858e4fba0247e85fb81e15fce4 SHA512 90cdcf9e8aa063711cee273792a94fdf4929c0dac94255e28f5c51894d91deb71284acc94d733c11d38c503c5f1a4770180582eca570a0530d215418eed9fd97
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip 154143 BLAKE2B 077779c5b91e3263fd0c30d65b0fc62f8c49d0ec6e8b3be13faf1e4536cf93d4c725f34bca7cd285e3ca1256599ac81ba61ad9d171bbc1d80dde7b5335b6e90e SHA512 446d3314c4f8c26ed361b682e49a6ecfe012106fd177fbe420b5bcc6780d382ee0f426276443e0d66a47fc72dc2cd8768157fdc3bd769641c17abadef8217101
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip 157699 BLAKE2B 15dfd7933294898066316bcf6a0943e1dfa8b6099ec8d7f05425561f622c4d81989a239d46543c37d9cba761eb08ab6a1bc6ef1fc8c8f48fc0059edfe6720ece SHA512 286608571a79faf71bc8cbc29a77ad4478cd2a1d6ece91bdaf4a7c056141a154a04c2c8a93612c3d6536a6064b9ac9198527888a3fc0cb7756ec41548e7dbd31
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip 388333 BLAKE2B f6c8bea9173a292f6c208b1591e4c311659518af5f8f6a3d7e9e48f7ea4fb319f019f33a43ac31834be6272581940faba02d0a8f03059abc3a3a4be528a7438e SHA512 45d58982c1a6d99da0e9422185081ad33067b0b53aec2538f3d25a980623087cc9b89dbd99690fca8330055b161a1529e6a00f4aec6201696ee483b17786b22e
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.0.zip 78774 BLAKE2B 09f57d4427503eab35f8b1d8a26769eddec6b61658c4bdbd9cfe1f4eef1b13e893301fcf0f32b2cd938d633e757e3ae610bca5212117a22c5acef5f840593472 SHA512 8f2cf0f60644c5106cc8b9d7e4634ed869c4b56247e3d675f1746cac2c50013667a64b2d915e9e6c1a47441fb5b5c711d1e55ef35f6aaa73e44b762df2a7acd3
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.mod 41 BLAKE2B 183bfbb35eccb78acfbdcadd1a80aa8746354813000d559b8e597e5a6447812060c8e4daa2f8ec8fdf20ee8c04bf632d54f0445d6d81946c4f629e17748c4a39 SHA512 7aee5e544927cd9673f3cd9b02ad6607ed56e53782160a20c8e737511f0a021ac38ac0ad3548808552348a3573831f5c4bb3c85625cf1dff96cfa39b9a30129c
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.3.1-0.20190929122143-5215b1806f52.zip 27376 BLAKE2B 636f28d65cfae0e099fbfba16137a3867397186d9ccaa9c1edc8448dcdee90bf997354e2282287b1b2d32368b837a406778da47fdd93ab255666df5f4e7d5dc4 SHA512 94affda6f4f7bc17e073e13273d6cddf238a7523ed5e9e03dc596633aca90a8c4a97fde2dcd3fdcd8d37258633df8b46aa6415eb910dfd8734464e41d122e014
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.mod 80 BLAKE2B 5a419c2474d8e694c8831b1df3a678629e9d7f796124fa2fb098371a0c56b78ce0acd0b585cb6bb4a838c70e697abb3c39b3b0df6fdca0af002dd9258b343bfe SHA512 b5471c0a96c49c3f690cd606b41422e2b555d2b088f17d0d12e0ae11b4d400e5ffd958b09e6bdc8d1fcb97d68cf4b08b00343d92414aaceec86f444e41ed9070
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.0.2.zip 6363 BLAKE2B 857b896ef8d28a249199ea75ab1bdce2dc75af065d3a83c0193b1fc93ad6e6724dbe54cd221d3deabe7f4a00f9a64776dc48703f047ac7228bc50b0d28ab7cf9 SHA512 289bc424f9cfab11aca847b66719411e280369bd64a5d09a7e5c28df74404581304fa748df543e0e95b5d86e37be23ecf5cda80e165d28d7c65d927695f55b95
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod 31 BLAKE2B 2672a50a0d2433b86cac9329ec96a520f2d426b5e04356056bd1173a3e297696c4bb6d2ba30efe34b557afa6c7c973af7267ea8d1a9d939860fb8c438863b6a7 SHA512 851f7cc28e17fbb5889fb46b71283312b4e66755e6bb6093b2170348352a68ed0c7855fdeb576160ed659563f79bf9d5af843a8c47c07c8239d4edb75e07f498
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.zip 1626 BLAKE2B ca05b4d972d8d06a6e105f5acafd914c5a01ce99f4b0f9fdbbb3c96d0f88d2c9a32106e87eb1aabce00a71a70f3e51b511494d7616c48541a8f1ef8602fc89bf SHA512 1984a63109549737b730daf40ed08fe42066c6edc572ab27709a6b20a3ed203d16315f2bacc45e83860e9601d89fe6dca086af021c33bd2e796f43db3bd2b76b
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod 108 BLAKE2B 474e77997e73380c030b4809c8f282b643cb0da9bcd1e0b0a231aac20e8f3ec463df76824372300b199a1453ee90995e3d682ae1ac12bad05f1dbba4fc2ef517 SHA512 13789a725161311e33af6ced4e07d7b548ddaa069e34791d8c6b4f1bf29ca1653ea723f5da79953f2e2314a3d81239985882dfeb1700c3bab4a3579cf972eb4e
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.zip 9765 BLAKE2B 0282cc6aa3c30bb7268d464271bf866cda78fe373aea7671207f1ad26b30ec3360f7e64f3432b32c6376980700c612dc121bd415226f3f5a4457f905b9275d36 SHA512 43122b457bba1c630432585202650c41393041f16b0703dd4e46a4ac3ee1d4eac71f406de8d33fed50f72ea171bfdeb23a328c45459868d464c4c94a002acef6
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip 17858 BLAKE2B 5fd0e818c37d7054ea1fda8ece6783ac7ef6268f5c9b6ed54fdcce889ac827098475ca5ee219115cf254317eabb590728ae8c574e795dd543c1a697273ae201c SHA512 d4dae97f64a683e23542f205f93ce682f44b7569643f66112f3cb2a682d96a216a0face54631ae062d3b55be3dc6e6b710d7846eafdc78d7c981f3d16dfca6d7
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 75347 BLAKE2B a6f74be69c8d42d3cc84e957dacd59f5f96fc49d48972c04ff26b623dbfcd3b5c2de13ae3e561e9a491a32cd52cb83d26e171f624191ceb4d659e5b0a3bc7623 SHA512 5dedfbc126ef5a3d146b2f3df2e4efa21cd4f1132bdb9f71801e55bc8583959777e57ee2664a85f3a222d656b910e1017b9b855378c93f65e2f623b568ef12ab
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.zip 106195 BLAKE2B 82d4ca0510361ec78b71e07e0d64b4ada1f5fea6699795ed0a2285aa52552a37162b228b42d2934795906d71465f44177f45a528269ed0c672f2eb9d4505bd42 SHA512 0dc5b88b554bdf47708b43f1d9f0bb6b35aaf22f1374414146e184ee33b91c531e417b6e8ae84cadb5b0d66ec14bd138edefa675d4b61dfee0c43b838a87e235
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
+DIST github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod 34 BLAKE2B 9fd28cfb3820a52a553cfd20da7dcb35c93c98d0271e08ef1e56427c83c7e8e50d11ccb7555dc88d584c1388e7e7e78e6309826e3b374d3fa7932288f3f9b2dd SHA512 113a623f9bf38e0597c7e759f5faa2dbc1da66d3325235ed3f1e8d29b70646e133d00a6532e4a6acd15ba063aeb669ed276ae06ae8b8190a2da51a173f8189f4
+DIST github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip 5056 BLAKE2B 1cacca25661d62ac399839ab5c2520046e8f4ab0388f020e9425506487719d9b5b9655d8cf44a381f00bbee5d3f4041cff3678c14ec2fc29899057c6f3f62417 SHA512 dc9a34f7aa4da759c2d90f79b6cf9d9797859112eaa2400295ff7b8a224b42a2825f78ee359a9fccad9321b141aee1ad1b707dd20bba5fa06e7a4356a0f8f9a1
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20160118053552-9302be274faa.zip 5226 BLAKE2B 9cb1ea35d5dffade9c88b08b4f75e794aa69cb83203845dfcf8cee5f4afa00de3a5673e246a35aa2238e2ceb9c644ecb16a5469dc2c0afbf7532644394c6c937 SHA512 6d15facde8ec2b5beb0c2235afadc89fc0da89d6042860b0b971eaa960c3debbe8c7057b789e89d8569772d66ffb3f789a76cf995272b98f96036e44e0caddac
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%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%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv0.0.0-20161223203901-3a8809bd8a80.zip 8090 BLAKE2B 98bb3cce47304ae392bc4e7b71f419ede8f1d939aabcf6a8cb09cdb376251d3a662dea9e03fbb805e92836b8ab00220207dc4aa9408b6b5cfbc41b9d02c0f274 SHA512 acb2c150b6ec2a1dd16847a1fefe945277c9db2d3341920a58b0249f4d550dd7d9b99ee4a254d516b88a12aa2dad1b070d146febe5ecc90e20f3a598c57a66fb
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
+DIST github.com%2Fpquerna%2Fffjson%2F@v%2Fv0.0.0-20180717144149-af8b230fcd20.mod 33 BLAKE2B 5d9bd69b984101e78df4f8137b633bf94decf11dc822cc2940a8f4566032975c5e9041264bac3dd24d7a877e62f21d04cf62005c1c2cfd9bc29157c2e36881d3 SHA512 04a5987e65bb878dcd0b5a364d677f1a87926bf545333ae18ee97e9eee281965f126001e7811d6dfc3b0fd22b8cbd719ddb2a3596e30f2a6a99222d28a052161
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.zip 202706 BLAKE2B c006fd816a6befcc13385f45a687693b6d9ad4e3bbee4ab7ac0df960e592fbee887a6cc3a78c717aedb84d74b03551cdee2c187855fd084e8e29b21614d59893 SHA512 ec62aeed95b2c0869f9cd532d59073b0e4c127761d01aee2f9768e0c175484c5fb55464452bc6c009421e7dffb29bc69002a612bd534a4222031d5320cdffcff
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.zip 152577 BLAKE2B 93ebd63d011ee7f0a610b7a5ca9fb7c2640bb57a60ccf4e22f46f81286c9e834a547b42db2c23d61d503eec5f4dcd0592e76a1a3e789f32d20d9182c6be7106b SHA512 bab9891928e51fc4524cc9384cea51429004d821ffcb1243147337169308cd5bf5791308fadca56d0f310e73fb69f8d3093bc35c654ef9f1c8738a0f1c5ab8fc
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 188550 BLAKE2B 6163258786861881f6a7b621f8578e8dbe3eccecee396c3564a88686cfe72584e234f593847ee5cb4fed6a6a1009f1f14da8238f967ce5d68ff919410d25d8df SHA512 42a764174dc4a56c6e27b0e83004f042b3fba397039a923310b8bdfc658ec24096395f27bbd69e8275c1d0f0ea45ed68c2015ffdcc74b6186c6d1497f0ea1e6a
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod 380 BLAKE2B d5e50ceb9388a268523bd969c58c4dcbb657248897a652fb1714f180bc5c6c84fded29702d68215f7984e4e100840c415985becd9856f6e1c4f3cf1d2be969be SHA512 a3bcbb78ac52866b5bb8ba27c58b93469ffde745ebabf78c91b06d33e9bfa4641d91afb189c75c10a66f10b8d080822fb8960719d588a1f4ed54650b3b97fa19
+DIST github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod 30 BLAKE2B fa38ca1c196a8b295cc8cd9c15b272df2146dbf0cc863df7c886963027cd0e32e60b13d69732f816d3a0878c63703b93044a7a80a959acab2a183f99c2efce8a SHA512 e5e3217e444afa2d3a36abe503984e8f6ce5a5cfcd38cb12387a4aef74894a24a23526793e59b6bbd1b63cc79e2a136e7c70170b3bf9db2275a78567c28b3dd3
+DIST github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod 40 BLAKE2B bc3d826f4064d3832b3c6156849f9734bfacee51a6b5984a1dd9e4432fc83ce9e73f913bb36e17d11cd01958e7eaf36a83b3973a03c70a381c23e60eeac1bae4 SHA512 60f8fb7e3e922979c04db7c0e461f22385607f2b2c76600f230e44f410cc01dd2f5e4662aa89171a94ddc2385d879a785f3a2b6ca806a4123bbd2509fb251be6
+DIST github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod 30 BLAKE2B 53e949e9e3374afdb5250b4811a9c5bc7af81c957eacf7e71d7eb7c650240c49f8e2c63459e6e333a36e0ce6e740676799ac37b1f26fd8863868c793b6ff0a48 SHA512 be2eca7d9608113f6c467085bdb4d42a2b69bd28a64156fa15aea88c4036dc941df7bff35c7c051c58f53e3efaceb38cca30ef3ef9f63e160bbf707c1d26bc80
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-charset%2F@v%2Fv0.0.0-20180617210344-2471d30d28b4.mod 38 BLAKE2B 87954e7e21abfc5f1d40bbba91fc4e2b06ca3092e3257d39ca49127c61982d9b236f37cd23acace933df0535a9e8f0e95d579f6d481f0ef2a1d24acf4e8339f5 SHA512 238fca7f3153fd7c98b60b49953fe77dcac55d09cb683a4762da41ac0387eb2a46dd32a9b476df96afb2d87b9a0c6af20fe111905d8fccb7d98af5e52f11ad8f
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20160810183302-0bfd3b39853c.mod 33 BLAKE2B 6258821bac21d5e3eed8d35b7db10197ff9432f4795e10e6a19c928778e1a8c47acdea6d697e897c80fc9617bb92809635a9c82f890e0b643c12516061021b3f SHA512 9c8fab721fcf3a8100301e1c86d3d93cd40ebbb597780e9c02c42ff0f30b54b1cd4a2f7b1887bef09f548ac96a2e136d56f63b8840bd3d13844b59ec2d1119bd
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip 109710 BLAKE2B 297364f2e7c0e7f2c7c2558e23c198f4a7e5d97ffc6a177834144c822aa91f0d5e9a6a700f6feda3c3c6f83db1cadc1ec174ba0b89872a20900076b02d2fb4db SHA512 e62c55a80759f62532cee4fed8e7ea0616c10c42075da8a927851d2f9359d6919f8e555034e2d9bcb2cbb60f81cf61a74666c464dc0fef0becd1635faa42f3c0
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv0.0.0-20191231050035-015626177a97.mod 40 BLAKE2B 136fe49fd5814b394c0848ab6d39f97ea4ed8f12b5e0110e2cfb0e2110feff5890d70943f478ec49101591411db03febe6ad2af066ac6053c96b48ff8e27b942 SHA512 38b44c149adb46ce7d707e135391113628ea187219dc577cef06d29c865b8dfda8dcd3447849d7169ed6f3a0189181ad05ac07a17e4a3c2586939e0214024ff6
+DIST github.com%2Fsayboras%2Fdockerclient%2F@v%2Fv0.0.0-20191231050035-015626177a97.zip 31960 BLAKE2B 0a38dbfa9bd7df351dbc897e2eca08966b0d9ef3b17f1202d3a751992aa2a18848ecba1b6a9879a6f5a33e0ca9b28c5e08a98c7d9cf3ccedf7bdf426055a6208 SHA512 4c5c44f2fa9ed803d6afd11934b613d4371cf32de3ba38debcdb654aada3a82c2d10e088340f8468e1990423a600a5cf6e1944a759d4f6817e1348b03d26421a
+DIST github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod 32 BLAKE2B e8025015e31a3d5b74f81886e755e9338d9020d49b616c6f7b8bc871eda360a75652715a1118074594137ddfc4b66c5ee4eed5db8ad81c056cdcca644ad36b3b SHA512 0062faa3aabba9df70e9fa757eaaffc948057d356c8062c4e042c5139885d8b44e461998ffd6b4d9d5261091b30a9ba5d1d1943063f21ad5572bc9d679d0bb17
+DIST github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod 44 BLAKE2B 74f7855fc5488715e3e4b73dfbe83b0a35a050447fc3369c06c532592c7678cdeb28e9f1fc7ef4f5c14fc90c458d8654baec12ab0453117219ab7b865259ab63 SHA512 b9123f2c64dfb2b16e7081bdd7cd3e5a54f911387cb13ccd5c50c113b3ad75ccb64c754123a3b41d916b4a8d089512eb65a5db5eb303f30118775eea553f1d8b
+DIST github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip 20630 BLAKE2B 1455301faee92bdebcf4b34c3706600da35240a4b386b90bdef1536c9307048dea77b08303232d2f98b2d407c90dd5b3455a87cd076c192bd755728554155310 SHA512 b77f6e753874e09fa17ddf869be3d4e81138c0ef1c277e9ad58a2a93c89ac8216db3974828538837bcc9c912b73ef85efa5cb8a2863fdcea9b7bd9f559a571ed
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.18.12+incompatible.zip 202970 BLAKE2B 31e277ce4bc8abe949c24c2a1d40641118b2180132e358e3a7bdc56d6715a46dd1092236c88f9316091b5e667b0d1234596fc570389e820eaa77fb6ad9ee197f SHA512 f344ed659e1171a13468e44ebc147e067be5aaf71be6444c6e3f40e3c83bebcda1e8f6ad1aa5ac399512dd962b182477ad4481f5c9f329279017494ac20cf2a0
+DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
+DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip 54143 BLAKE2B b408a5d554b816351ce754904755e90525b4bf74b7e529d0dd378fa8eae70a64677cae34f1efa9477d865fa752fd88ee9d1e5d420608e03078ed0f7d1aaaab4b SHA512 b06876629d4ff5d9145a1608ea513baa72b04087dd8ef5e4ae1ea611480770bb041be9b84d19a66855fc57596cec861e70e53660bb63c9385b0e72462fe913da
+DIST github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod 30 BLAKE2B a19bc3a2a838d03257065184fc24526f5bc8881ef06e4217e0439c05200efd72d8c1f9f7f3288ae69f8317fe21ddeba7fcd35d4431f29743260d0c96c59f6e40 SHA512 2fe62b980dfafee660aef1ea4113fba52dae15e24470b7ff258f055d7f7cd7f6b55b9afa1d46b1cf9fabc804e00c00c452e9bd72ed160dcad2e459dfe5b245c7
+DIST github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod 35 BLAKE2B b4c85147e92e894346c0376cf7dca7e581ba04be40caa18e941b6bbfef1f10e3dd9c5c2df662d3a1758328b3198a04bc00472578043ef3568ee95caf689f111a SHA512 aae1d53204f15d9feec965460e46a299bf85072a40711174d8db5ee21ff50776fd401ee965b2c45ecdb352535c9e4b6e6275fbf589482a27a84baaad5b7807a5
+DIST github.com%2Fshurcoo!l%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.0.5.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod 283 BLAKE2B 8d2ac0a93e8060c85b68a1c3b7f1a22572319c9a8c7f7d88857f8b04793cc55141d63e53728bd85ce4c2a2f3ac27bc7dd9c115b86f5f3ae9d27aed9ad4ebae1e SHA512 cf2637b8c82a9c67cbe323e6f6601e93c6d0840e053a4644b6e6170a4efb56d670007b15eda837e89abfd17b6c15f179c96cd92cc9cea4002f27125cad1049c9
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 67427 BLAKE2B a05dbd2305c67d453c5e8ad02b407be2fde660ca88ebbe2c4b4ec7e89666900248cf0170c19b82bd9679c542395e893d5efd833669738b4232d4a18949569f86 SHA512 aeb73f790a1b6804aa46a4031c4df4ff9bdfe809d225622da428119ecc83b02d3f45bf58f39fc9364540a0eb7c7f3ddb66e3f6949136b3d0d52786804728cead
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod 29 BLAKE2B 329362a4a6143a3ae3fa01298ec9a677e0e6f4054edcad3d300db7fe5a095fd9347d5a239b9ead9beab72bdaa18e6411ac342b56e841f67eba226b802261870c SHA512 961f65a3d308161a97fa3c3d85749f53b7e7b0cb44704f330616c46898ff12e837c9dbca88a02826f40fb70d2b3fcded34a69bcf0f133157291ec3e17439f7a4
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip 9350 BLAKE2B 04c151cdab19dc03754e44d0f6d158e3130b6f8d5556247c13e5ff28636ea611ee41251855431d722dd57a369463a32f14d1a46ae2f68417031acd00af0358aa SHA512 6010feab0201548f0a6e9423b39d0506da0923a2022558de88eb17428346c4eb130023b4eea8640d5e52ec68aef84eab5b4aa2ca5ab761d43cf649e86089f226
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip 9825 BLAKE2B 19f73014efe76cce5fe92a4956b494f58093416931f8b71a6f3a25c7220c34f3e8b981ccbc80a6711d11b5b706feaffa84b5ad288927ea2e35c73ffd2973b915 SHA512 e92d5ce203ba7e7f9cdfc4e9c383a6b25a7afaa2a14c057cd51397a51f6fb21eac97e6fb3df1cf810f82d7a5d055ddd354ab0178edc9ddf433e2cb09f1125939
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18e0337f9146af34821783f04024be09e18f3804558482ea56acf28048ec811ae679e0bc0f6044774e69a98c575b0a41e210277b966bfb04270d7ebf504cb1c0 SHA512 0b3a57fbf1292964f8d35a7b85e9c828bd2c1344d68e4d04ce84acc9c99e2239895058fa656d45e0e5e622afad62056b583fb00a5dd3181302798ea99b0b6799
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip 41977 BLAKE2B d82c7ba2e7e273670d8a3d6b01fc541f0bc8ff5eb6c3da71c8cd5a671d7cf02125d31e4763e12dd7b5c3d1255ec60d89d00e36463cdaa51c83b68dd6dbdf533b SHA512 264db96581ac8562cf2a295f2981c5c4f7785df74f0f7f1be22ba8a336b7db1eb16d73abe86bd5e6846188a24deee7f752d71e5f917cd9347895c67823205d7c
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod 2141 BLAKE2B 156a151b0a2adc3281ce942a6b33dd518a60248a9aa927241d787a6a6e4c37f8acb76cde85d8ce6e7351bea257bf0dd8a671c22c5f4d5d6a8ffb150e17ae291c SHA512 21bc1c47e67da822efa2fd98ffe8c0a9f432e95be723682a738a82098fab25771a2ebec1903561118fde91a08ae370989cd5375432cc21d80ce07ba2c44ff6d5
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.zip 58955 BLAKE2B d166997642948f605267acc424df7c6c73af2e1d1f8c549112573398d5b335cf958e16d3a670d738117f6b67b4a13cf30fe51052fd25418fa4935f4311eb418b SHA512 f383fce33fd0d013af0d577102fe4a92782119ef46fd3191ea44122bbaa77a47b689cd4ffecc3d086f5e02374b0d36aa10946c7505d5b22bded154da4190787a
+DIST github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod 35 BLAKE2B 7aef81b8041187cad774ef9e48d9f2ccfaed9e553947dbf8fb06744d02885e530b4833d36e152aa92f51bc6a6b25cbcfa024e6c70e74db48bf85f93e3335672d SHA512 b60065792a85db6921379371c5a18ef5aadd150a90afd152b7a9a0ee270fa5236f43bc2efafb618f77ac361aaee5bd690b210f3d45db9036fa109d29bb0c95a7
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip 10296 BLAKE2B e82879edb9db32d5d9482b6d99f0bda1a04d5b54125ab92629c35777e3ab9001ec9d5321ac0112a245d59cf5b06cb96d1dae785cc2b64ef922d904bf6a731f57 SHA512 6bdd2a829369530a1a8e2b2ff93094b5b0a6fb35873a63f79498b45dfd8c557ab0c91a393974089af1309d626c3fdbde1b02bcb64ffa05550a48fbd0a9d76148
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip 14006 BLAKE2B 98de01f568485c6909fd0e98a46e2cb040bc556c175948af267453cff5c750c32e95b27609b513073d374da19a8521e62f7a8cc195e0eb993662e1c443cbbfd5 SHA512 7782b65f0d21a519d280f1655257da7b15e5e433f3eb3ff4bc963c81fab22cc9d18ffaea0786d9a7e9f5f32425353c055ea8fcc1daa1e8a30caac47ef2ef31b1
+DIST github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod 30 BLAKE2B cb0fc1336f2738d7d9c55f460d3983d043d78c13f79431b0f01530b780e27d3f44d7eaba3fc4170e60fb5c5a86b26a5a41f4e27fc3ba1c1cbb88ae23f5bce5df SHA512 729bbdce95d05166c0793f65ff5abe5178ffe5305a79d06ba2f447334ea9a13404ced5ccdf4d83b4782d88f46fb57b299750a14fd2cd16629696f5f7bc8a8baa
+DIST github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod 40 BLAKE2B c2d18375be8a03fb939416726dc4f68e4debfdd4366ed96b004d231e7660d0c16e67788c3c0eca64a86c031d3d7787abd221b8ef3700cd0a41fc5ab35cd53fb0 SHA512 8644194c5cfcaba2ae9698cbd366d268878b4d80cba48858df7e8cf3af97e046ca376daace4ce1c4ec44840a047f455942884457d9b3a563cfa0de8f3d5a0e46
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip 508602 BLAKE2B e490d835edcf37e31ae1efc155f0b2e418f78760ff1c3c80d45972abbecff3674c58553b631918bb9477c3d0826321321ff6e5b4a5ca4625fab4c4de12176102 SHA512 e4323f1101acab6d76d312fa969f694f2252568bafd83071ed5db9edc66d097feed8422f7c57db57afb3a00236026f7eea3ddc73ae14eafd4f220b7a1eb3e1da
+DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
+DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
+DIST github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod 33 BLAKE2B 1ec43f923edea0edf1f795f14184b3b320765e69beaada55115d54eec3a694f82eac2f15f9a955ef66fabae4a7cca7b98220d6a5231b792cafe2916c98d7f2c0 SHA512 e166de678d1574543eb71f61da6aeaf00396e370d7d6a408c3e24074ea161778e0e836132eed85c364e08bb93909fde32ffb1dc1be5d8eb3c9da09d7f5cc7ce5
+DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
+DIST github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod 321 BLAKE2B f1b47bfc9434a89a99aa50b4a714d6cc2e140697e56e34475bd0dfd82cb9782f7837b922468d4769a15641a2a2dd90ce3eed92f1e15a718947537cd1c35bc50b SHA512 0e8018de1c1a59dad1f183e59a5ee1210925d16e4deffc37356b193991b24e23148def88dd6dcf010b2ca74d8172009cf96f500da80f5024ed872940ff191387
+DIST github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod 228 BLAKE2B a5dd2dc83306e4addcae5097145a5a3eb09f77e3df29d0b09c1638a0406c2baa64e2fbbc204c0450eb5a53ab310285e1c73f4fe9f539c61f2b4aa7f1a1b135e5 SHA512 15ec40e7dbf50b73b56c35b11203a8f406b35f51d8f201df80e27a4cca5c0ea35217196dcfd75f68b94128e20898fb69dd8dcb0bc2d2ff3c210d1c126fe04246
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod 36 BLAKE2B 4867e6ad22da67000c8f082852df43453cba9814cdbd8370c83bae347da0c426c2e2d705a85572e08a47c872bbb880f7b8befed360edcc8a866609c9486b4e0b SHA512 971639e43bdaee2891c655fa90626dd50be715f1d8493980d6fb081deee7940ad71bdb35887a3425b600869be75dd32e344b2c5d68e54e2ef3d6397c8fbe6490
+DIST github.com%2Fvdemeester%2Fk8s-pkg-credentialprovider%2F@v%2Fv0.0.0-20200107171650-7c61ffa44238.mod 973 BLAKE2B a70c24c2be5f38b4e33c8fc491de11facc41430ace77f1fdc9f038f7d898084b49060219ebeff04bb0733c55fd79d9276d5f9a1a3f69959d5805b47951b128be SHA512 f04f5ebc962e2d9c62a9e3d7b3ca5ea2723b8d1cb536e5d7aec190f396b605f7a35b2ab9c6b46ab9ec10dfd28b64cb009487017f5243adf905aa58ccec0d7403
+DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip 160183 BLAKE2B fc6ac9b8beb1c1edad738f821182d572e2e655442c32d4dddc27c0213a5d13dffe3c107f6f947a528a4741972d72af879963f1503266628f365a96ab8eb21d83 SHA512 d6b124a270150ab54764406789f23955f5ffc09effaa2b7f4ae0c2d3b69ad916fbf8377f48ee5650bb57a0e9ee2079a481d4fbf146409aeb29c15eaac260f3ef
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20171111001504-be1fbeda1936.zip 9431 BLAKE2B 0c0a5e639880d92f868a0384b81d65115d4bc43c3f256cd560a86cb608d6d5c77d73cfa49be874c66e86830e5e8da45f8ad27f34663b7f56f65955cdfe977c5a SHA512 a63ca631dd2789ab1598ceb16405899a1df859075fddbf7b6aad80cedb555e5213113109942bb3963f6a77c2ff3239463b0b38925c80a46620a07614165fbaaa
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 9425 BLAKE2B b18ec4a4e021332404866950e4839e8b00db652a3bc196fee5f7ea928085d25b44584baa3b8e65f5a26edc4a84450152fb40c8eb11dabe82641c2f569d6de126 SHA512 41675a07bc201e97344136fb7afab6afc3974a7d4252068311c5f24968f6a46b979e763865e61586c5d3c8f2478a046915e62b5a7829785c703d180f4c2af58f
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.zip 135843 BLAKE2B 08573e384aba330b98184c5ec6bab425a52b4a3a25b8b04401c516c1468ee978f71cab675f4de229b0a1c4d59aeae160bea8839f0f1c8743ddd9cbeab2077da2 SHA512 844ce89f24348f710e05b576c44b455c9a6235a75cbb694133b4721d747e53c21add4fd3f7d21fac990a4440479d2d5382562e97c874e72f97f13cfdc06141fc
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod 33 BLAKE2B 6f03d324264d6508bec7b0d2075be3243927963f196b7f394ecaee719e93d0c01e52599e6be1776cdf8eaebb12ec16eb2af426ed1295111ba137fa76a022303d SHA512 2d1cc625394c148f83dd01d72770770eed383ec6797cdb2470d2f7e5d7f9c5cde07aaf003cb46dfe12547491aef79c119582777ffbb9482dbc5667828fd426f2
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.mod 33 BLAKE2B 64dcb5099abe2fce237d615037ddff25e28b7fe69ec302ac75117f839a95cb6f834657a783f305730db2525d40422e5bc6c1cc60520bac2257aaf209e69638c1 SHA512 b719b4c4afc230ad9a98619bf8cb2fc74b8fa5b11d57746ce64b333c27eb72b58f28e7b18790f6227cec3447fd450604b40be967fc24f65151e357a8ef6b4adf
+DIST github.com%2Fzchee%2Fgo-vmnet%2F@v%2Fv0.0.0-20161021174912-97ebf9174097.zip 5885 BLAKE2B 81196456a39847de280c8e282c775879d2939c3143e2d0e98463a97736aada7d53c0fd0d37d6409d50e1a2c1d11b5c29a9b55a04f446ce6f0a3fa932552d2aa9 SHA512 bc7dea3a3a185480121e599b2e3f1b83064758ec5607f022844ec83ab53fbc4dbed62aed98dc5d5f85d8273fb6ce0a0cc5ad2889c4bd03e824e836b9e7f537ec
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
 DIST github.com-VividCortex-ewma-v1.1.1.tar.gz 6042 BLAKE2B 03a1a3b89113adb1a99133aade2b30847f201cfa18d7de1fecff036dab397865293e4faa7edf66b7a6e5a9221989da6daa64e0a77a4ad7c26f7a9a2283aae13c SHA512 cbeb946dc6ca9a16631b3df900754d7b85ca6863b1be596612780fcd1907f4f8c301460b3a5aac97578948a591efcf2e64b574517c2652e09dcebb14076c6395
 DIST github.com-aws-aws-sdk-go-v1.16.26.tar.gz 10525967 BLAKE2B 3623267405181b503d411cd76c52365dfd4ff50a192b40a6e18680fd7b7c267e122580387804941de3a9743078b916095f35bed5bbea1d4cae1d6d92b610984b SHA512 29879ef3c7edb525b66a9a7802a039b32429d3b2073697a77a8a148e17acc1e9dcc5b9774c5237afcfd5cfdcffa7719404c9611b38187fa9361899efbacbdb86
@@ -90,8 +920,359 @@ DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6
 DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
 DIST github.com-spf13-viper-v1.3.2.tar.gz 36932 BLAKE2B 62a214160e4307949f2c2bf31f335f116b92852bb5afc01ae2e7d866a6d07d4dde4ec3c55472d4795d1813a57f8f3d750c92cfc909efb636efe405acd4912110 SHA512 7e70ac39d36ca9917984388977fcb95488b2b977a633c1adaa29ff342b1b5a1a7bb21b23e75e4ccbb624143712e6fa4028a47800ed5879d27355fbd61f9b8b1b
 DIST github.com-ulikunitz-xz-v0.5.5.tar.gz 477164 BLAKE2B 505d5dfa38cc36ce9a9ec742ae1b7fbfeb5b658cbc8d376e103459b924e5ce4c1c23aa1314b308c28bf021ceded10e2bd590a809c35667b927c5aa42b210eb68 SHA512 8142b2031fe13b709f77721de9571966029ada028c59fb756191d3607263de9023a25bd322f26a9700c69d9b9a78ab3020a5e2cdec64c5dff6b31ec94f3e032b
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
+DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.mod 1566 BLAKE2B fdc426240c77756d997b434ce56a66f02370069fe646fc44eb6cf12b3942895b3f921046c88f5214164f49f8f70e254d92971ca2eaece8c2d46227c5a93bea3f SHA512 d21eed264de91923ea848d4432ac7e8b15b8fd5a07f6f6ee5e4f7ac54039fe204e989377ef86fe737f5c62c4c0448ca6c961f9f320876cdf49b522d44891c657
+DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190927031335-2835ba2e683f.zip 1048202 BLAKE2B d81a91c249770bc942ef113390ca19e6cce8e48aa8cb479b344aaaa0d16f2bcdd8eaec7a97ada9f62dbe494c3c12b7db786cabbb4d39e872165ceab66f61c9f9 SHA512 1ec044fabf83af88816719406e8a4a42170402017fba8b50447bcaf834a731a4739d6aaec060221e1ef88b83010a172dbaff8e19f95df0f6f9340478c07ed75d
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180426230345-b49d69b5da94.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190424203555-c05e17bb3b2d.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip 1826082 BLAKE2B 2dfe94db073155037d35c92d9ca4aaa2aa6986529934ad1453eb543921dbed00b9f4b628c5c556342cdfc2aac1eb85fdd5eee5dcf2b9b6fe2e1a0e5baa7031ef SHA512 eac19a322c3eae4a80541780ab9be5c7ee68c47eb1be7b58a4e5db8280574f65f3055acfd2a72fb9db0ebffc459f27f3d6897cf3a605bba67b836f2582fe9551
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip 1871198 BLAKE2B 952b683ea0441db01cdea99ef57634d79e30a112dc649e31dede9232c1975c1156f8e875b1203457d30c113d0dca49f01771b8549c18a2d7ca2b5dc135bfbea7 SHA512 41f3d3c47c1784e991e2b971189432fd4f9d693414e6340289b2debeb291d4972d6fc63b3ea06b84dac5dd369752134463a4275ba36f3db94cdbfed6ba3c9c8d
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.zip 134147 BLAKE2B f7d43790feeb13035488c2749d41a33f21f66f3d79d89f465918301f8c9bf9045efcbc191aedc6894628b35d9e79c9fb67e5c5109e3644799be747c6c233f322 SHA512 13d1a28e9df57073c8f25a8d86e17525ae17cb461bcb6affd82cc447394c8068d13653e32ecf1282af6c4811680f4883e3d856384480f7d9ad47b320fa76a1d6
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181102091132-c10e9556a7bc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.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-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190502183928-7f726cade0ab.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 1422609 BLAKE2B 9d879e8be7102a414510c297e078d409982052dea09b5990d3c2618e8f0ec94ba220c972356b1dc7dcce4941b7d5ba6dfc2e0490a37bccdd34e63bd4f71810c7 SHA512 d0608d4fa986159af8c4977c62d99e9b98cef21cbab548246deef3e1b054941f1576b6243e65de6855740869907098721be140fcdbff6bae9e523af736979fb6
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.zip 81395 BLAKE2B b96db2624f437e789a49998f86e027aef77ab03240cbe1caa37296970c69955f404458bac0ba89ad1a781442f6961cf6ab4eb5ee31ecd0531c9e73564dedf310 SHA512 38c480232f2fb482b79f60a54e1af412bd74608a63cc1d0157c09b7d471d3af4815e6d4a3844d23deb88e89871e0580ede32cfb83aea6dc6413d6c04573aa8a9
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
+DIST golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod 25 BLAKE2B 1f8cdb1bffe6a24b9ec7efc36b1f874d1949b34c1555db9cec96a5b0408931e9cb6629770bbf734a2348c5208ac055bc31034b6892b936ec6e60c47b1dbdbda2 SHA512 482a9cd9650c6ed60700e635b05ef1a9ba9d412adb3e6824015511dbc55aedfce3ad4636d195b76d393452b578c022df7bfe6ae868cceca5db1a8b9f08aa29cf
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190122071731-054c452bb702.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip 1866142 BLAKE2B eecef3b6640818edf21f8bc62cd44ec7c3d6959165cb85e9bb1132450100de82c43c0337db78d100e0ff9b886f51427bed3f3987176cbf07ce38903bc96fefbc SHA512 fd3cdf5bd56617de83a09132656ca226c4334447f68494282fa7101ba2d85ee02a33d5fe870ad46e59e5fce4bf7bc031e0f1012315b6d017203e3915ac06a87b
+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-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030 BLAKE2B 7c223aa748649c75cfd8e921bcb10cdae7b52fd8d9096c7a5a0b0a167a307a4813e7b0976647e2d70c658f1a75e9821f78f0969c9ef73da3d498d6755d504f2f SHA512 43ed7210474ffec7b4f9a0dc29e9f4ae5f2ab6ecc5b9f02ed28d9751d8f11e3cc27700e5b0838a76f450d9bfe074d56176d5140daa3f3d40b287695ebd3dec18
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip 11430 BLAKE2B 71f78b102648ec8bbc2dddfff5744befa947cb4080dea3e9889e27096e261f2dc3d7b2e413d69408d01251a6c7f256238e514a23b4c633b7eabeb198d7835c85 SHA512 2485a31f9a111dbe614d619f6007fc973006f372c6104d5549ac4661d838ab46b42d2d03ed7fbe1ca9231ba4d247a4af584833ce172ae9f48ea42519a25401d0
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190122202912-9c309ee22fab.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200115165105-de0b1760071a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200115165105-de0b1760071a.zip 2943396 BLAKE2B 2a6f0e9cf38adee49354e530d15cb144307806128577468bf91b29c042baaa740f01dcb0ff7f3badbe74e8d79365062364b3b575f14f464dd0211c474496a36f SHA512 cccffebe4e4428645ba389a87705a4d742bc36995c1743c5ad4dd1f7b95afe99aba8cdc0cf3cb825c82d780cf0fbfcc346604f114a15f96da0ef99648596d747
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip 19898 BLAKE2B a1233d14bcda685e77649385f4cb03d5c0c0e2491dd01db12a81d3e255e0cc2636950142ea3f647f8177390401ad6236fc05af3537e9561e2e021a4c60ab612b SHA512 464d0f5e1ce45f303f0cf3b6c109629384cb23a8d1e23c5cbf16fbaffb19ae1641da4457b1baabd0e8d2f9784fda64774adfb4c1baaae837877275396d0f22fa
+DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod 203 BLAKE2B b902ba60b159380e6169e4c6a01cfed819541cde7e25deb4455de65799492c46bd0a8ff6031b332a458f730f2cf5e9af50fb8de918abdeff15d60f20dfed78db SHA512 7c3573dd6aedcf5ccec10490f251c793494595672f68232d2aa0829b32b6922713a0fd2d9ac153434b7293def6ff84be6bb5fa88d2c62663daddecf42b1b3098
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37
+DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod 394 BLAKE2B 03ab5ba304253665f78c32d938e2603019d2affc82cdcdea5d14ddce39ee81fe9d9cbac9db23247bf983f7b284f3ab11f6cbebc9534af1912e719b2cdeb21b96 SHA512 2096f9ff0961448645c4fc6c3b8c3f12724219074d6f4c0ad0fdbbb2be23e263cdce4a33b6bd483595aca3be46a25d6b2d7715e5ea2bc06b76fc6ebe71ca12e2
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.6.1-0.20190607001116-5213b8090861.mod 814 BLAKE2B 4467907a8c67804ae0d799a6b80323ce0d14c0612c5a9500e6bb8a59ac72e937b6101043d58d5df29e74ed752ed539e3b549262aff31cc2fa51ce329fd3b2aa4 SHA512 ebce54fde531bd84ab00dd8ceaddb4985906372f790a110c7ef68d934315b2d6a14dac19f655fc7ae92d1fca33c32d99df6568587816d1eeafc68e81c6327f51
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 13193468 BLAKE2B 26449251871cda35dedc488c3c8c8fc4dc14b1bf79dfa5160b44e6890d5b350111277b1791b18d91a42bd91b6f382baf3caf62584e41c4a928afe17d564e2e6a SHA512 85d4096a7d867d8f4bcc1b3cc582512d94c626023d8abd20ca343009e62b600150076f161f3582ec88c6263695fec0c11de69290a6c6cd04a177272740132be8
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip 408275 BLAKE2B d9469c2686d9899f2a61eb606d7f8d79637eba5d108ae077be3f2bb5b8fe7240378aac0660317597d46bf8aead251506ac0119488cbd54cba59921517b3fa726 SHA512 ae7510a820f4d2a46354c2c987c362ce70f782eaea0ff3a0a627e9cb4b08e07d6a1f29d24fac5be6a8784a7cf3e82708b427c022682377efc2b8872326e6635a
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 418135 BLAKE2B d3a64e18959e36aa267f235f1636d00ad545cb32a9245641bd771d511d8168c8070a2e517ae2b65d4d5911c1202267ea8cdd8ea8ed009cec3ccdb9013ad9a0ba SHA512 36a2b9842757e17959c520fe02243502017b8a074da8105763de86ba14c61659f49b3bb8b1eaf8b7c93f2ed297889a26dd43f3f87a139e205390cebb36f2e446
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.zip 8218059 BLAKE2B fb966a2841e91181384a1139e406a1ed1dbe2d987512bcc6bda78fb9fd83c3d19cb11ee81ae0f85c6b2d541bdc2a17300063a7f0170a99e4626f85776a26af1b SHA512 7a5c9471cd0d5ae5d5b245a2873142984a4ef3c6ed5fd46d75d4753312437099ffd5cdb4aa32136d84116a03cab38a94060ab2b26a65360529ae3e9702c136b6
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip 1027160 BLAKE2B 9cc654c2155c5306cbea34e57f9c6e527cd8504278921bb46186c9997a3dd15278a6cda877df9cdac8368a03dd793a071fdc55ab7591cb9d6bd26dcfbed469bd SHA512 8cd3c2d502dbf4955b29e3b0bc5439b7c9ea82c0bdbc2749bd378d5dd30eea81631dffb4aa3306ee4633b0c988f45e73103aeb5ef38d6cc63e6622886456fd06
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip 1053568 BLAKE2B 9129891041a943600fe66257e4036ff077df77ea9c032ea3e7e13dd03c7194fcd1ba5d09cb351334cbc129e9f710abf97f271d8d656bdaa499921a5cda24702c SHA512 69ad2fa3d49761f823c68f3939abd8891aa9ca80abe060e747ce9fc78c4cb5d7d5c983a02dc93a30a581c9c5992291fe9e78897e6d2aa5cee025a0af6346c587
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip 1065639 BLAKE2B 71bbc2ae5288a6008a020b056970fde4f25f64dd6fa8a6d3e1129256707c332af7d07861deb1c95cf068bc039c3dc2da56ff12b4560eec071b9f451e91ceab08 SHA512 e261d085731561e7540eb367f12d5dd48f424eae915380ec99cfab5685297c2e81adc8a58fff68ab29fecd04d03c28e2357c882fa72978391750fd50491fd29b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 1101208 BLAKE2B bee7938f7e39bd6acfe03bf03e1d4787f30384f34fbf292ddabf7e172dcf8736ebc0d32f7d26bdf0021252dcb984766bc3b778312434a4ffc5f515f009fd26ed SHA512 8b90599cca0b31538086a5d65dc124c2e7641ec42b4774b15b3f5cb063b39f3d8f83a7114e89e6aac1dc4cebbac526105378a3cd9504bc723cb26781b5d214fd
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+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%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.zip 18129 BLAKE2B 8c86db4ef6c4a8d223e9503c9642aa1461bedd37fd69c468740b152e19612ff8b4b621edd3877844a16a505b6d14bb786f6e2923ffad29ac84ae538b0d6556c6 SHA512 508f0ebcd5d8ae4a2c467b7399e97f7404b741a294cb266e11b9059ed5585192c9a5f12112bb1d2066f18fabb5b01a87abe791d2158e9a7d561995f64692dcdd
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip 5369 BLAKE2B 348bf4892c8cba465502595b388fcec4f11024b9359f202af0cdecb00ccb28c742304361d38b663dabb0650f185100780578eb33c03207c1acec26b81ca1fdb1 SHA512 bf982d63fea6bd93f2b6be4d5bdc986d1316b6f92ee7af9b604b6f0af1dab44d09697b913a7c8ba59d5bed26296721b6cb7ad25b7a4481cf8d649c8a3e2099d8
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip 60242 BLAKE2B c813626bb38afad9bc3064400989ee298d938a1b9a6e619c512965361f80c7da9a5654fc47b5deba2fa758822dc542c9a6d1f756be881830a6b68e3a39e06a41 SHA512 b47b1ad2eff5abead86f0611bf6355e699ae5fe3ded89fab6efc3b940eba7ff295aa2ffd64bf3eb93cfe9b77fcdd82f8db25fe0ca91823019c9b3fb89feadc75
+DIST gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod 38 BLAKE2B 0f62f161dfdcb2e0cbadb8fc183ed67693b8a2a56862799f579125808f8ffa47b9138659121f642b00bd59d82510b5d2bc8f2a824ce0ea7e300ba3f40cb83690 SHA512 468bafc5985f802a58684a1d6758427f5fb95bd41480af49667b7e74e5cf803ad85f2474184ce5104e4677395ff7d91250453d07f698b707c8aeb229dc6b60c4
+DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
+DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip 443068 BLAKE2B 58bf0a619bb1724e9ea683ee2348e187aa02d9a7bad94e92d221058cc80dfd87177cf2f61c0b7d6f7b17a316a82e85cf9fc058a9a0e9ba13f3a651a14dbb8271 SHA512 22d184230f718bbd6462806aeb43ef3a505c6508bb6e45ed18de5aafa1fb363c21a3c4889d61735277e5b4b26a5590bbc0d6d170dfdd6e8011c7abbb3d8cdd93
+DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 33144c2d794f0c82dd97c993506bb6267aa9c65eb99c535e92b206dfdbba0d257a64b12d553f85ec2c770c87c196db9fda863c7f757778e4b36d4cb0fc98f844 SHA512 93ccbb29e7c38516a22d7ac174d4c2e9b87203061ae7bcdffa92499f30470e90d7e88f515f789e1a15c34cfaa6e7c50249e3d26ea1ef8b2afcd92dde62cba044
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gotest.tools%2F@v%2Fv2.1.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+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%2Fgotestsum%2F@v%2Fv0.3.5.mod 806 BLAKE2B 152e954335921e877de339f7e99fa60876458d23bdd66052f600188b2e94342cff95e0968a8570d802993aa5ddb1f1c814d22ddb823e9a6b0913866f23967a8b SHA512 be69a790b26fdccfa5a72d7e5f5c3ab328691f8d00a38e19cab7d5ed358722bca084c72ff6fd11a1cb11e259edf0e2ebdd3975de329f7cdc216aa22c6a84b7eb
+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 grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod 20 BLAKE2B e14762111ddcb60b4b0d52ea4ef58dd26501463483aebf674713b6cca9a2a7a000c77f212c0fc0764ae69891b0c307c97bcdbc3bfb1f3fa5032582689bcefb89 SHA512 2a842877eb3d9f5d1a51864053d1dcafc6f74cf834cf597d1c167da6040a3842d409f4bb8ceaec80049ec0f70c4b42603016bee64539616e2f988160c5409afd
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.2.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST k8s.io%2Fapi%2F@v%2Fv0.17.3.mod 505 BLAKE2B a2d79f0629a976f255f80f8c32ca9ceb70b2073c15202f2d79fb46ccef27c8b826b8a805bdc079776fdad35e826cb2f0435593cf5cb9154fa8430a99dd28c915 SHA512 9f1dd316e83d93c4fc5248e48b7830dd88d6fa745da377546996c4c6de0ab357e7c379969624969d18a8f889e7faae35e1910fd5cf182608f0e1d0a3ed1e79b5
+DIST k8s.io%2Fapi%2F@v%2Fv0.17.3.zip 3937742 BLAKE2B a0e7e4c77133870452dc4de1a759bee075e4c260d1b829836ac64e59f009de32a19d5beffcb3a05d93cfeb7555494a58a1feef04169e478dc512dfdf4efc8232 SHA512 174d1e1602d1f02425e9bbe1fffa41509a32c662fec8feeb6f67093a7da1a7a9b7c37ba072bb713e587925d32bcb07c60dc7967c5402ebad4bed8d8f4764cb71
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.mod 1585 BLAKE2B 6d1478972d8bf6f8f6ddec5680891673525ff8d9c7c5a9ab127463b5a34d86d99f3ecd07a715355447a1c02eabb5265261784fb2d4f22d8dfa03dc730d794ac0 SHA512 05905763fa118f53826a6885379bd50cc4e6a2fabba7415fcae2c8f57305ac71e9e0336398d96f50273a48cd205adce58b5bc8f280f939e856cd64d19fd67ca7
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.3.zip 592024 BLAKE2B 1882b31723fd3732c8c429f4911f859c11322a979a573bc98d55aeb97022161077f944a608b439bd232f74cc7ff9c2ca68c684c3e85a756a8bf41b33718ef183 SHA512 55520b536be4307cb78e2d0cbbd5536cda2a41860d8e5575bd5acdb4d171e4929833587d49d752bb93f657efc87f6c1166b244504d2a32a4cddc0790ef46f522
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.mod 1618 BLAKE2B 544cf7b9029cc057717a99916ad72a60ae755c2739ef3a22c4c87096b2f2e678b2d7dede69b99f4202ccbf156ec3ca51bfdad1ab44f2f9eacdea1612cdb5c2b0 SHA512 fcb522e967968c075cd7a6b6865ee9bfaa7f0c300d7a2eff32e949d3af1cd33cc27e252a1248895b9a9597dc14d1777eccb55d721b409e44544e88947f0eeb07
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.3.zip 779246 BLAKE2B 1274799e2fd6596025e6734ef9eb4a00636f69e81f715b822317c98ed22a72603011264110821196dd824cd7cf88d39c292b8dd7fe681f0125506cd72ea41006 SHA512 d00035d52044b2195777f94048ccf93419a33af05b58af6623df21ab886c249db152d9da3198e8a661d72b0859abbbc41afbb9b7c9b6105376e3217cd4305831
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.17.3.mod 2745 BLAKE2B a887aad60b4d3bfa8f49ec352e244a6f031e2f08c9334a9ef6bfe0f73d12043061b9c12453e94f7f09e9bdc0dc1fb1894bd8282d2a573e15c2f832eb1e008ccc SHA512 fca822d93714532ddfad6c5e91da2699224c23f8d5cfa2a46a0075de852dc0874fbecb66ce089f839efb5f404907722bbd1b1ad4edbc44e987a3dc1ea53601dc
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.17.3.zip 1388333 BLAKE2B 50202cc2cbec819f295de5d35d4ba5f345744b4f75538755772136c948283903405057ffd40b64044e06ae8dd7bd0f01fa656a6c30ca1aa06d2b6fa067f7c5e4 SHA512 2aa3eb01529110af472b19e3370936e1bca5b9af908e8ff39a5cd5e8414124a61e0476eec68b18ef447d977e35be586e6a30f8fc1e8419a980f4933e4c2b1a42
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.mod 1172 BLAKE2B 6219154b638c2c3c2ca4db08f3073689d4865f98ca5ad624c02c6410ca37a3c6689a11a45f89c08abf1c382b80a48065a2d36677dae1c3732b07468946934361 SHA512 9def286c085eb1bcefa99e83eeef12f68715640311467f9f9e1e3ff7f724fc5e0dabd6894a23bd4601a28e25a25fc047cf659285516ffaaeb843bd8a42d89655
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.17.3.zip 170664 BLAKE2B 5d55e5ce6f09b0e9d6ef48e20809a7d58e673e7c00dde73e4173416d910f960b66f5b7b8909b46b994b557ee9f44acc0864f7f78a86e8fde2e677273e503b4c7 SHA512 2bf4c518283ab81b38beed29dca4817cda254794c155a15c4dd2a7f683cf8a226713a0787a528fa36153454c412327cf33aac84dc339d3903919d3cff68529f5
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.3.mod 1649 BLAKE2B 47f1995ea7613a244a881bd72a0c8851e49a9accbcb197feeaf0c5bbf40334601be0e04aba3fc176395d7c1bdbe8d54690823c06ff4f7194f0d91e8ddcdb932a SHA512 4b6ca3a164408d5f1e17dc3a7cd1c8a9fb05cc3e7f2d91703ad8e73a270eec8300285c28877adef6f1b8b6d96b30220c25a9640b0c6a417ba44e7931644607ae
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.3.zip 1585001 BLAKE2B b4eeec2ba91fb96c6baac8ded3df1c468aa51d806a31ff682dd70657837ee8d8df4b977a4ca99bd83c3f5d04faacb42f37363b786cc80ca22c14e60bb0e5a66e SHA512 b305708e2c9561996888498dea3cf1335ccec01159bc085b23f946178d4d2a4ba62aa1015b634045cb86dc8ee189ddd3d444a9ffc4788344432cc36d197ac6bd
+DIST k8s.io%2Fcloud-provider%2F@v%2Fv0.17.3.mod 612 BLAKE2B 38b51d05f10827adec12373b641e6f981f02b9e5797f412c96c8eb7c1c3cc06c92510532ffe1d46037453b6d5f10be6302035268832ea0a2adfa2cfc74265321 SHA512 862d356ebf40684c2d1d38c8cfc29aa5c369527bc7d3c21c88701ea850f60542228e84441f286600dea3135ac232ea47c2addf273faea7d63ccc1b7d6b305feb
+DIST k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.mod 633 BLAKE2B 3b68d0b7fde818a2b0d0c3e6c018d5608b8a3cd1ba69ffc326264487bd01bd5ea12df7a9433ad12f4cbaff5ad9f3864718c2b3b1f600b564bc7fc6c12adcfa21 SHA512 81f0e501e31be27b46f142cbcfef340ccad524725bcd3643e6a7b0ba8b7d46e09eba73663746581bb118eaf1ef8f51f996e54c55e52229dea4809b1a88de965c
+DIST k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.17.3.zip 28054 BLAKE2B 44d462a1caa8a48c59a84e342c92ee121feca1089defe807110a3a403b6589a89fdd24c480539678cfddb7f04a9480e9fc63662689d20574e8088d92d3158a7d SHA512 28e72c6259cd96644faf8f48de7f6a18aa87388190a41482c5c29b9cd2dfc94d6a778285c8739337e9807e7353f54f6117be75033235064ba64eba2a5a930a24
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.17.3.mod 1209 BLAKE2B 86249f056dcfecdc4d36a30dfc6b5a762060670a6e76b5b6d5167971c21567ff0d9abb2baa8811708f1e594e644562b6ce144aa4dd0b0206cd8813ce833e5f5c SHA512 b88c027d2c118a7fb7d701877b55f17b3579c22177c73e608b76778250aef2983a79fe4e7cfd18da8b9da00887ffd67a8cd71ac86a1f4e2d81b41535ca774476
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.mod 893 BLAKE2B 0ef810d310a3964f2e11d3b61260747c5d1851c2d1e5826050d9e08f24395d4082db21775772018d093f4f78bbf747cd38fc2687d3c2f0e95c06bd542be9bfaa SHA512 c192f5928aa16027d2a815158625dcd66d2544e66f3d055169dc011f1da66b83269bec968756a818eb7c590c4789732a54c567329315239695ef111e4e659ae2
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.3.zip 130165 BLAKE2B 0452b8a4ddeac3ce5af95940cad7a05ceaf978e44c52016e27f6733ad75b78ca7d775a0612693de61a17bee92f93f3e87e94234a95de5dbfd22beee433a6400e SHA512 ddc3246386bb7f530b929ce2c650da197662f9ac76e295481d9ae67189482c28383464f3ddbdf731fc74f26a6dcc12cc93fab3777d1c3b613948097a19ef441b
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod 941 BLAKE2B 308754c84fcf1d8791cb4370e6d3862f6a6a8883cb0c8ddb45854db28b763214e189612245ac6060745a3513b17b757cbe0a36b45ea5df94761cd3af8824fc34 SHA512 608f947439cd7000bad07ce0c3c4155a8ed6cc8a61662e12487fba1c44627d43cda14bc0234eb3d5fd441e12a7be3ddd56345f3d7d8dce61f35e97b078975c14
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.17.3.zip 100233 BLAKE2B 345e06447f70bdcdab336a0a8ab7d8e236a772ff5de0845f7775988f15abe27d80f90a73cd29234eb1288049d2dd90c76e4bc1aeda98ffd445087295f5f79872 SHA512 1142d62b648fc950f4eec059d97255e4f61c1ef75a479a5f300fc7e6c65b437e4fe26ed65c2170c487740e906e9c484383d2fe023efdcefdb734ebd0c02aafdf
+DIST k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.17.3.mod 609 BLAKE2B bbe73297d82f6d909ebe4fdb47375335a6aa5e08edbdd6f62ecf62e17db7d71d6702f9506244fda146f85efcb5bad311c5e4c88528a8850fbc157780349e61f0 SHA512 d12ff6ffc64847f534a7915c72f666980b2c9ba3ace4328b7627419097485adf65bfd5fdd9e2322982cdfea3239da6c606693ea7ac07c6024b5514247676c7ae
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.zip 155511 BLAKE2B 294f52f83e1e2817df5b6b2154d67c7b1c15fe5ea973734a1489a28961c6b5a27ef41f825d8cce2519b749cb1fe90e6acb03a83c39bff9f9fec9fd3208d4ad37 SHA512 49b40d7fba22e467ee8519e240c03971ac23613f277c65e0e4a51ce713e1a04df9b6f5156f3276f57d68df8094fae4671fe6b7f7107370add74f639d41e1d3ce
+DIST k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod 23 BLAKE2B 0d84b1d2f5efec714030b36a6c80618961074bb6327e9f2a997de9cf39cd448849f93f14d0299d8f3d3b9bbaeed8daae88f45e8dd614a4a8ebf0de4c5f24ac7d SHA512 6eb8433725930d2b59b2efe54b4f7608a237bb16b6811f80a3471a40cd7a5364d50e77c614e245c42744607ef502b30b6abfd25c746eb39b7b5700d56f2a4cf7
+DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
+DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
+DIST k8s.io%2Fkube-aggregator%2F@v%2Fv0.17.3.mod 1252 BLAKE2B a9f38c0c0e3be55a410b11b5f003782d217567bcee2de94b6c8018054ad20c4c6daa53dfb4060fe31e4f6b3ad90169fc8f0837a3d162dc5d4f621e34a1723215 SHA512 12e8b681ff921fdeb19ba76ad379b1e3fb2107e9068858d259fa82a2b71319b55cef15eb7cae205a4b39c554d989a0fc7855e4e4fe977053b8a2c74ffb07f7c9
+DIST k8s.io%2Fkube-controller-manager%2F@v%2Fv0.17.3.mod 593 BLAKE2B 9b083f4e188aa9740b9623b8c9a5e58e7a81704f7ae7a79c7939046845769c85ca3e34d58f35fda051f1ad289cf56200a20f0ed7f5953ebd6e05a72375ee461e SHA512 2c0cf99f7050badb1e45f9f20591b74cc40d6c13e5d0bb24735e1cf0c76da0514e912ca97ee9255e38e152a25277aec77a2358d2c92744bbe0bce039e90c17d6
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip 826182 BLAKE2B 00f00eef706ec917307b0d6c7eaede29936e5d81395fbc48ac6d5bae6b6137bd509a4f91398d293e6740eaefbe061896e00ccfcdfe26e7a92b4e80870fae31f3 SHA512 206e531fe7a55399aeacf9f523bc27dea2c251f41839fb313a45fbfcce7c893e9c85d89eb9b1654be471efec016d3fb4bf4d3859530b5b700d6dbdaef3abbee9
+DIST k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.mod 580 BLAKE2B 3e02ba6c4d52793da066e8e36b944ddff79e6a3790e3e298a7bdb7150c2af5c07694388fc90569e846fd6acea28114fabc8ad14072879d52a59b9ab76a4a1b9f SHA512 e3c6b5658be3e2993fee8c8f682624d128226b365f94ba9b8b7e95b80e29354048a46cc33c1ee7da74cb6064af50733c0053cf166fc2bd911eb823e5d0252f10
+DIST k8s.io%2Fkube-proxy%2F@v%2Fv0.17.3.zip 25193 BLAKE2B 919730d3d4ec15f9d970a2c5996787151fd7e991e0e3d7366d3e53af0a04fa1c8313b83bedeab1432de9857b75bc953fccba8f5d281d511180b9366e1933133e SHA512 57b0a440531eb2500184531ccdc8ca08e4ad961e40c0f1342cfb2542ce6c78db0e83f59ca95c537798551a3ce80d3973443ae5e6b564d9f2cc9f43fa36dd26d2
+DIST k8s.io%2Fkube-scheduler%2F@v%2Fv0.17.3.mod 584 BLAKE2B fc4d9a6e88a226106043f67caa23bdf278b21499cb8fb196b1fb370e7b5b74ed713a14973ebb358780895130bc4d36cee91c8d1cf6ff159aba64305f62e06456 SHA512 36b615c95cd92f7a302d2080502467c120e6cf25c02846af00cc3a999ace5e016467d15f3b20ba9b36287850d96673e08acac140fcef718fd15f9262062f9855
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.17.3.mod 2669 BLAKE2B 119e93b4b57b160b865413c80e4b1eba6b558ed7a0b35652cc04b877c00b5ec702fac00ff4ed10aa1908319c13d5771210c151f0444d91050dbdfaf9e4634452 SHA512 a0d742a238dd07a3e68fb8b1cbc04ab623926e6a3a3ed2867c4089670ead60100299e2d5a55367d1e14fe94ce9c163aa43550db497b37823765acdd00046472f
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.17.3.zip 3320484 BLAKE2B bf9430547c0527e784b0f93b9da8747b7bededa4968a9d620807668baafbcb76d0c646401376feae26e09894db389e2ffb452266cfff8161a43ec72623485756 SHA512 b0aa420ca148f893a6b61aa58a06d5f114c0a20b0f871626132213fb9169bcccb44ea946f8993d26c23dccbe4f9e4bde7dcd0b4ccd3a0eb0470e16b135244b9a
+DIST k8s.io%2Fkubelet%2F@v%2Fv0.17.3.mod 687 BLAKE2B 8464542a9ab00e277db07b2c5f83ba6e60730af1ea011600525769589eb069d2ea5cf5bd5b019b86719858ba9dd2c5cc6119e123417dead1ca68e1809b719551 SHA512 25640e85340f16c59ac1f14e03331d03ac59dedd530a07e8cb6d54d94dd51317b4e019a44fe296be0f3162e442e08470d45d8f7c045020a87413a29f41d5d266
+DIST k8s.io%2Fkubelet%2F@v%2Fv0.17.3.zip 82948 BLAKE2B eca518fdb3e34c6861bc2a21ac3e328ff8bf761bd7c69ad32dbcaf027b51735def5334e315463452cb09a0d885543cf702e2de17dd60a91fec15c5f3edc91b69 SHA512 1825b85197eab4a98e9b70c8e8f53db6ec3112518c417cec7a48aa9a997d50dde176fea53b088ddbb08f00fd796cd0d94c8110e2e3b6e80bb36eb7281699d087
+DIST k8s.io%2Fkubernetes%2F@v%2Fv1.17.3.mod 38953 BLAKE2B f7aba8db29df7c70215784cb14d8c467df4c63c653c28ef262030129fb66f5c93356875789053cac5e7299d18dc9ab41c48e186e8ffe3a6638ae915bbaae08bd SHA512 23effa653320806644891fc8fab906ec183c4a67063ae573328a850bf5ee5e8f33f56e0e16095fb13badf9e4b6287cfdb8b64759a57e101043689544e7ab9a9a
+DIST k8s.io%2Fkubernetes%2F@v%2Fv1.17.3.zip 13182548 BLAKE2B 17bb352885993ec4011c052373700c83bb2460f2da32ebf5e9aadd8aab68781477b31b3b7de535d9290a9e9eb23d9fc152c27ee914e13bf3eb61cc7c50e02332 SHA512 4a82468074396fa1468c8836c16179273a4fb19b1e87cb6b325f12e695dc6c453364544e5772e42ddf7954cb19be31562909e80cf99a1c4e5287458a657e5835
+DIST k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.17.3.mod 1962 BLAKE2B d315e83886a31b9e2b6aff6895bab0b4a77a5548f35642c8d6086dde0b15964eb7638e18e2bd9ac1decbfd20189e4094ea22c9d3c2c7851ce9ef1d17e6b48c35 SHA512 c5101f421d0b0f0a85c4d154da9ff0d30c4f50c8a43908a1ffb53fe2a7170bcc1e9364ff47d216e7bc6e01886f5606284138f9dd9c0ecdea81b0fc620686cf53
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.17.3.mod 722 BLAKE2B 090ff99666b1ba9b99ff947bb248146111995b487a6c7cdafec71979232e7484e40e25e294e791f89d5a2e38b5274df8a9eacf0e9f0890cacc34e0dfb66b0d2b SHA512 3ded6fc5d574609c59967f5d0adb1cc441930e43e4e8dcc9e9b1d12cabea4a7d01b9ed94800fef05bd75e482e913a7ca762d4e4fbe2d65b977c84894fb602d9b
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.17.3.zip 149320 BLAKE2B cd5670054e8d09ecc1b41414c2737875669209371385e8a830c6ae49bb610153dab35853914beefbd41cbb9d6433cd896957d7cd24e8176b5faee0c5c29cb234 SHA512 6854b57e8205cbbf91a34e13920e4fb10d266ce862030e3600a97594ef47f04ab10fb4709bbe020b13456e9713997c504aa4d7c4e9105f4715a4a6d196a030d8
+DIST k8s.io%2Frepo-infra%2F@v%2Fv0.0.1-alpha.1.mod 740 BLAKE2B 145e64aa8594fe8636a0491452191ff94122339b991084390a0a75f0f87a08387d2068db1543480245e7da92aaa88f2ec19e029294cc52d59fb6fa60720a188c SHA512 7699ad6b19604e8ce35158921f15850d6e94a0f9af82b882426f1dcc134939ac48d495697945ad079ac57efc1d4efa690ef875f7831a250ac1b3b19955a15dfc
+DIST k8s.io%2Fsample-apiserver%2F@v%2Fv0.17.3.mod 947 BLAKE2B 8139f490365f3faec7358f0b0e2d4c748974747c7475f6dd5433eea4092e6d3d95ef6400d575b23ff9aa2df6c82dc9219d835b7c919fcbb58573065e77643552 SHA512 6d35819d8af604465df2951ec30618216f0404e5826bef15d7f214f0e7b404acecb30f9cee500f65e9319ee7aec013c874a963adf1a095be35d0d86ab4d8d607
+DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.0.4.mod 165 BLAKE2B a683494e23a9b7d336bc85b6930fea72afd26a55198c8600913b0743599306ef5a7d0535121504be9abb225cce6dc22b617277678b06ba4fa5c9ee874639e836 SHA512 149ef1f35d43b77b6766dfffe96937e43f61e53cc615a2a59f8b19b14938c74ededac0e6adabc0b3b8b16fb1bdd4d58ad9e829044f332575d97e9ca821f19207
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.zip 137840 BLAKE2B af608dff09741f6cc1fea2044d4409bd238949f2f965fe890fd8dc9cfc7d6b1e00279486197c20cdc4aa17de2548f1835afb162b094bdb04b4cb079a8cd81d99 SHA512 ec27f133a5042a2df05889cd9f131a27818165e126dfdc330c0d686b4121b35aad64cc0fb66d072ab358c62cb881cf2d7706fa21a424941b226d0d9c19e61eab
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200229041039-0a110f9eb7ab.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200229041039-0a110f9eb7ab.zip 142565 BLAKE2B f07f331ebc449b89e63c1c6a34531452ca6e1e3174ee1a0ee6b7ef27b633b065eaec0f4009e4c57b59c30c9ae9019cceb0cd115fb7750d36dfaf2c62c093c15e SHA512 1dca0ef3f5ecb4ae7a94afa3daa3021ab6615fd8c7480b5804074eabc88d017457d2d9ca6cd17dd00c50de55d3884b2fb45ea2673887b032fb8becc909676447
+DIST minikube-1.10.1.tar.gz 78757817 BLAKE2B bc42e2ef9a8fbd62a3160ee678413e869d65a00a609bc8bb5648aa746e7f793b51450e149ced275e05e02ce11f25e7f043a73ce135fd86fe3199e7f39773651c SHA512 e775bb0528d31f2a4ec36412bc5907f60dde4bb637afe448182304cefa7bf6ddd2935f30f49c1696b44ce68ae348abc3c790a908337cb767e70a19f08779ca43
 DIST minikube-1.6.1.tar.gz 78447692 BLAKE2B 16ee3d0f9dfc90f20723ae9ef33a36cbfa02de0f00d973f34c2e39872d6b954d5909c1aa534bb690b00ace0bdd4207986f022c796dfff20f776d12a13796bc96 SHA512 00da5047404abd631e08046a9e285d8009465b3cfa18c4e238bd5a6549714fb21f19864fcb68973e9a317f03a270158b90c36c0601316605edf2ecf93175b12e
 DIST minikube-1.6.2.tar.gz 78450821 BLAKE2B 05efb671bebf197fa4942c578585583476c2550dd3f3dc7804bdd836f5b2cb38864ab39d267d968ace2b816220e7d45b40b7367782e8c1eb4755679c91a8f3d6 SHA512 40af184878e812defecf48308c1ce3a702415985e5e7dfde37d61fe3413bee5e986ecf4a873aa66f11faae733f8afa8c64e3b0122f4e75b7153764fdcc771c48
+DIST modernc.org%2Fcc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 26488aa7e4d0339d58279e663998091c24b5a6d4d026ea71166c06695034ffb5011d20f49c151c6a41481c6cb5648806ae5201bffcf4e2e49b6e7ec9375d9469 SHA512 22847329a9a431f222a2bde9c743aa5d76e737e2535b53273c31cb641c89fa4b73e51de12f84fb6da532b060a1daa084c5150502e3ab4e311eaff351f10617fa
+DIST modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod 25 BLAKE2B 5ae90f4bebc5486b84fbad78cbb9e747a2b1710805a35eefb93fb5f860c7850242067bf79c38a7a076f9f5823995cb4a2fa0120491258cfee9e87fd5996cbbf2 SHA512 764e7459060a8e7e90c8b8714926cb8b1eeb130789d1d89eb52e4dec5be83298bfe03647720c0e84d5aa9cf293a38f041e1696ccfe60a87cd1ef7316190b41ac
+DIST modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod 28 BLAKE2B d93ac859fd33dd8b36dcb992876edf1470206d4a455f6dbfc3a8be76aa84cd3b1a16a12e23d857b090ee5b18ba51441c90bc5d6a4bb35430193d7f99d61a3725 SHA512 53b0f0324ef1cc51f322d535b2199362be3962aa8e2d1c32b0c58da2fd4f65f8f19450089d78fc58aa89ff5903500ae2cb60ba38d89373c9f58f075db0ba80fa
+DIST modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod 27 BLAKE2B 16f598b7535482c888f2e41038dd4280846bb4a04d796f5c5e57f23bc74f634273f28841eaf40cf911b1bc27046ca8471bc0b2f7e4f93f4b605240eb0d755d54 SHA512 ecd195420e68552b6abe9bc99447e47f63ad37bee567b2b143eb612b60796a087f7948491f83c2b95e22e7ff9467f779702a0bd8557368078675964dd3748c7a
+DIST modernc.org%2Fxc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 27cf5be7229a20978f3b7e622f03e3d10c1a0feee65a7d785315ad461841e2cdad9cac5a932f014738d7240c0d1f42ad2fda7fafb3519463e6bdc6ce985dd139 SHA512 fa34823abcf78a4a884d7c0ce3807e519547389f0b9f5026ac6b600f4f22d336ebc93e2c28519c2b5aed7073f11c09234d694dc922d92fa3990c97f42d6cfa91
+DIST mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod 27 BLAKE2B 1fc5a95e4432c2d8c9c211155dc66a8bfc53f823f2129174bc7155b63f4c58607127dbd2d6bd793c91fde596a5c36a0acc527b13031dd29da156c04cc1efae32 SHA512 d58e0c14bafe02b1366d43f00d07951b4c11c3e4d8771d0f658367c107d7ed05266443e50a50e10d01ff57c9eb5bfd3bd95e56b2f56fc5cd704e48d9140d93e3
+DIST mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod 21 BLAKE2B ed7272fd29049af9e593f73cde21d7f73b40817f1e7592a1a706ee58c251aebdd423e4b1ce25405eaacb9a3b9b101af042bf12615e0cd907c8b24e183795a0f4 SHA512 a9fafa4c84459dc2958a4587b99823476dccd1e245fde663c42c3fa8784c99df27a3d90e0f9f1125f0a3b82ca89dc28ae58cc0d90084ff9df16acde7981b15ea
+DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod 132 BLAKE2B 0cfd958e837b6bbe113fd2272427856718bb241eff20fd6dc479e4a64303c9ab5323587bfdf5e731aa63da0f7af859e48f0348b5fcaf33d8cec272a84ae1a854 SHA512 cf385a4361bad78e100100fec51fd485600a90340028393ff9fc4b7fa7ed85c3cefee28c6a2789af8f0f4f92c8694e30c22d63fbceb9be1af1fbfe38072a0ba2
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod 29 BLAKE2B 6dcd5ffe918a42923b91bba22b5ed6da6b907cdb47dd93a471841ee92776606efcf74a0a788f188271a45682de307ac68cf68cd52089cf0398282256e3ef44a7 SHA512 2f557369d03b9991cb84462ac25e6fe937a543cae729e6dcdfd97d2e01d334d42124790442eda51dd1c87409e74d4047a523c020e4a5bf8b773dd065cd94bb69
+DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip 486035 BLAKE2B 9ab10ce74e3017ff57247747bc215b01c3da80539687369da2e12653c83a2f5336bdaec76f6ebde44187bade73372878578302f51337bc2b321c5b76f82ddf4a SHA512 a7c6ea8f2e9f5b321d4c9c1f85bca3e27a9ffe72a252227022299ba1f54634a93a36d021845ea6ac2c939eaf4e02edf345a70b740a124358b7f26b90ed0d2177
+DIST sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.mod 56 BLAKE2B 9dc129c3b342d99bfe7b3f09dba45a7dd7ab9f3f7057b3efa78e3eb4891a91ee0f104b7974f0e5764eae0b46c8605280a65d1d389ddea95018c265584e13344c SHA512 934d7528262e6860f60f15d4584faf7fce5906dadf557b516518739649d56a2d3ff31a7fe46f5f0fb7fa295bb692f24f0b7143604dc5d6f7406de1f1b3cd5312
+DIST sigs.k8s.io%2Fsig-storage-lib-external-provisioner%2F@v%2Fv4.0.0+incompatible.zip 89807 BLAKE2B dcf45ca07bf67c534301edd70c43646f0c1aac2d4ab73b4e66ba52fbe9c7d57b9b6528804aa0ff98c7364fb6c8afccf7bfd7714e89f74357c7bea2fe299f3bf9 SHA512 5cd2c50ac5b0c6dc4678bfb7c9332bea6641958899809965a20070223703d39a0e9f8d517ba59d2ecf020b634b1f18689f29bb11529ebbb59889abe2100aa638
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod 334 BLAKE2B 920b3fce37af000b4956b9eac7782f6000b91ce04c93fd67e709e8347d4e13b63d894b2c762d927940978455c6fe7a9b02f643f5050218a749a7fe40a28458ca SHA512 58b3f092f22d417aa0fdbc3795f9dbd244b63b9f888b51b335021402e725a9babeba56f101337f5726185b031b3400e3b022e4d76e3f1debaf5281d4360add42
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
+DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
+DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
+DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip 27337 BLAKE2B a191bd4ef424697548532023bacc2f1cc67801e456d8ada577946204686c444b53c2bd3fc757f77aa07d8b79b3cd45f01e37b01521d6ebea0c621f87d246861c SHA512 77441a4a14c9b5c266eedde3c9eb6d7499a7a2ca57139071197b71fe2d3d1d1cc63c3eed95673733a2b855f329ccb30dcab568e1d743231eb1238ca0154524e6
+EBUILD minikube-1.10.1.ebuild 66230 BLAKE2B 00775f6f5b8b2921a72c572367b71a313b9a01a1f0092a9570975730377e96a8a8dedafe94b30149bb1b2c17dced176b8c7e7436bf3f412a848471f054a111da SHA512 fcfb4bf35194bbfa7bc878b68a51a7762d2d914bbebf55ab955bceba05263000fb4e7f9b079caded1269cc6491d051a6fe96be2fb0dba930b82adb20f07596d8
 EBUILD minikube-1.6.1.ebuild 6937 BLAKE2B 681004882d53d2a7e5bf0a7b84c2a88485f40a25d9263438a0460d7e99093f24587518b4ebf01837f0af37008c331f9413a9c656b879be8c16563a0733fae6f0 SHA512 9438048cdff7053cae3dc859bc0cef6416107150ce0090cc9f0f7b209396cc6d4be2d9749e262184b55ad1417d4bf3be92bacc666c89aed7e38e192390c20ade
 EBUILD minikube-1.6.2.ebuild 6937 BLAKE2B 3a3ee5544c89a637410c2935a1c6e6cb70ef9663d83907b6f5a0e70984b25e8f5c9a0fd9e38eafaec14c6aedbfae84cd6925750a8fba9742e9c52d91e3111ec4 SHA512 afa9d5ce4241119654f62541737d1fbbc82fe2c3fca9a6f40f656e2587f0f0ea4ec637c3fc58144e9e8f61d1edf419e6be17b5509202d4e18ca3e307e4844100
 MISC metadata.xml 393 BLAKE2B 6c1d7e4c6ebff826d2a8eb0bf7a81fdd0c67279084e95aea0188e9b7e0f8ff869fc983f50c318cf17c42fdb482388e0989c655c8e65f18b462da0343dd57bf24 SHA512 9af4b86772936bd3299be9ff2e62a72dcad3481b39d4644b3774bfbdec6617d47dd1697205e1b3fa0a3944c38464584f42b8b2d6c7f1086b340d6a917f4d280f
diff --git a/sys-cluster/minikube/minikube-1.10.1.ebuild b/sys-cluster/minikube/minikube-1.10.1.ebuild
new file mode 100644
index 000000000000..a33c5389350d
--- /dev/null
+++ b/sys-cluster/minikube/minikube-1.10.1.ebuild
@@ -0,0 +1,1229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=63ab801ac27e5742ae442ce36dff7877dcccb278
+
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+
+EGO_SUM=(
+	"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod"
+	"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Microsoft/go-winio v0.4.11"
+	"github.com/Microsoft/go-winio v0.4.11/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d"
+	"github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.0/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.1/go.mod"
+	"github.com/Parallels/docker-machine-parallels v1.3.0"
+	"github.com/Parallels/docker-machine-parallels v1.3.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Rican7/retry v0.1.0/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/VividCortex/ewma v1.1.1"
+	"github.com/VividCortex/ewma v1.1.1/go.mod"
+	"github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c"
+	"github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.16.26"
+	"github.com/aws/aws-sdk-go v1.16.26/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.1"
+	"github.com/aws/aws-sdk-go v1.27.1/go.mod"
+	"github.com/bazelbuild/bazel-gazelle v0.18.2/go.mod"
+	"github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798/go.mod"
+	"github.com/bazelbuild/buildtools v0.0.0-20190731111112-f720930ceb60/go.mod"
+	"github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89/go.mod"
+	"github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/c4milo/gotoolkit v0.0.0-20170318115440-bcc06269efa9"
+	"github.com/c4milo/gotoolkit v0.0.0-20170318115440-bcc06269efa9/go.mod"
+	"github.com/caddyserver/caddy v1.0.3/go.mod"
+	"github.com/cenkalti/backoff v2.1.1+incompatible/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/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b"
+	"github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod"
+	"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
+	"github.com/cheggaaa/pb v1.0.27"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/cheggaaa/pb/v3 v3.0.1"
+	"github.com/cheggaaa/pb/v3 v3.0.1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21"
+	"github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod"
+	"github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21"
+	"github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod"
+	"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codegangsta/negroni v1.0.0/go.mod"
+	"github.com/container-storage-interface/spec v1.2.0/go.mod"
+	"github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa"
+	"github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod"
+	"github.com/containerd/containerd v1.0.2/go.mod"
+	"github.com/containerd/containerd v1.3.0"
+	"github.com/containerd/containerd v1.3.0/go.mod"
+	"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57"
+	"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20"
+	"github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod"
+	"github.com/containernetworking/cni v0.7.1"
+	"github.com/containernetworking/cni v0.7.1/go.mod"
+	"github.com/coredns/corefile-migration v1.0.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017"
+	"github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod"
+	"github.com/docker/cli v0.0.0-20200303162255-7d407207c304"
+	"github.com/docker/cli v0.0.0-20200303162255-7d407207c304/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7"
+	"github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-units v0.3.3"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f"
+	"github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod"
+	"github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f"
+	"github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.6.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
+	"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
+	"github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-lintpack/lintpack v0.5.2/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible"
+	"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-toolsmith/astcast v1.0.0/go.mod"
+	"github.com/go-toolsmith/astcopy v1.0.0/go.mod"
+	"github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod"
+	"github.com/go-toolsmith/astequal v1.0.0/go.mod"
+	"github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod"
+	"github.com/go-toolsmith/astfmt v1.0.0/go.mod"
+	"github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod"
+	"github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod"
+	"github.com/go-toolsmith/astp v1.0.0/go.mod"
+	"github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod"
+	"github.com/go-toolsmith/pkgload v1.0.0/go.mod"
+	"github.com/go-toolsmith/strparse v1.0.0/go.mod"
+	"github.com/go-toolsmith/typep v1.0.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f"
+	"github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod"
+	"github.com/gogo/protobuf v1.1.1"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"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-collections/collections v0.0.0-20130729185459-604e922904d3"
+	"github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.0.0/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod"
+	"github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod"
+	"github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod"
+	"github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod"
+	"github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c/go.mod"
+	"github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod"
+	"github.com/golangci/golangci-lint v1.18.0/go.mod"
+	"github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547/go.mod"
+	"github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod"
+	"github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod"
+	"github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod"
+	"github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod"
+	"github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod"
+	"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/cadvisor v0.35.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93"
+	"github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93/go.mod"
+	"github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2"
+	"github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2/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 v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.2.2/go.mod"
+	"github.com/googleapis/gnostic v0.3.0"
+	"github.com/googleapis/gnostic v0.3.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/mux v1.7.0/go.mod"
+	"github.com/gorilla/mux v1.7.3"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.3/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible"
+	"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
+	"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6"
+	"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
+	"github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214"
+	"github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214/go.mod"
+	"github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8"
+	"github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6"
+	"github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod"
+	"github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f"
+	"github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8"
+	"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/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c"
+	"github.com/juju/clock v0.0.0-20190205081909-9c5c9712527c/go.mod"
+	"github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d"
+	"github.com/juju/errors v0.0.0-20190806202954-0232dcc7464d/go.mod"
+	"github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8"
+	"github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod"
+	"github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf"
+	"github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf/go.mod"
+	"github.com/juju/retry v0.0.0-20180821225755-9058e192b216"
+	"github.com/juju/retry v0.0.0-20180821225755-9058e192b216/go.mod"
+	"github.com/juju/testing v0.0.0-20190723135506-ce30eb24acd2"
+	"github.com/juju/testing v0.0.0-20190723135506-ce30eb24acd2/go.mod"
+	"github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d"
+	"github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d/go.mod"
+	"github.com/juju/version v0.0.0-20180108022336-b64dbd566305"
+	"github.com/juju/version v0.0.0-20180108022336-b64dbd566305/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/karrick/godirwalk v1.7.5/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/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/libopenstorage/openstorage v1.0.0/go.mod"
+	"github.com/libvirt/libvirt-go v3.4.0+incompatible"
+	"github.com/libvirt/libvirt-go v3.4.0+incompatible/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.0"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+	"github.com/lpabon/godbc v0.1.1/go.mod"
+	"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
+	"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
+	"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
+	"github.com/machine-drivers/docker-machine-driver-vmware v0.1.1"
+	"github.com/machine-drivers/docker-machine-driver-vmware v0.1.1/go.mod"
+	"github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8"
+	"github.com/machine-drivers/machine v0.7.1-0.20200323212942-41eb826190d8/go.mod"
+	"github.com/magiconair/properties v1.7.6/go.mod"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marten-seemann/qtls v0.2.3/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.9"
+	"github.com/mattn/go-isatty v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/mattn/go-shellwords v1.0.5/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2"
+	"github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod"
+	"github.com/mesos/mesos-go v0.0.9/go.mod"
+	"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
+	"github.com/miekg/dns v1.1.3/go.mod"
+	"github.com/miekg/dns v1.1.4"
+	"github.com/miekg/dns v1.1.4/go.mod"
+	"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
+	"github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936"
+	"github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/moby/hyperkit v0.0.0-20171020124204-a12cd7250bcd"
+	"github.com/moby/hyperkit v0.0.0-20171020124204-a12cd7250bcd/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/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
+	"github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c"
+	"github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod"
+	"github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618"
+	"github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mvdan/xurls v1.1.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/naoina/go-stringutil v0.1.0/go.mod"
+	"github.com/naoina/toml v0.1.1/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.10.3"
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.5.0"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.7.1"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.0"
+	"github.com/opencontainers/runtime-spec v1.0.0/go.mod"
+	"github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52"
+	"github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod"
+	"github.com/otiai10/copy v1.0.2"
+	"github.com/otiai10/copy v1.0.2/go.mod"
+	"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95"
+	"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+	"github.com/otiai10/mint v1.3.0"
+	"github.com/otiai10/mint v1.3.0/go.mod"
+	"github.com/pborman/uuid v1.2.0"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.6.0"
+	"github.com/pelletier/go-toml v1.6.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/browser v0.0.0-20160118053552-9302be274faa"
+	"github.com/pkg/browser v0.0.0-20160118053552-9302be274faa/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80"
+	"github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80/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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod"
+	"github.com/quobyte/api v0.1.2/go.mod"
+	"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+	"github.com/robfig/cron v1.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod"
+	"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97"
+	"github.com/sayboras/dockerclient v0.0.0-20191231050035-015626177a97/go.mod"
+	"github.com/sclevine/spec v1.2.0/go.mod"
+	"github.com/seccomp/libseccomp-golang v0.9.1"
+	"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod"
+	"github.com/shirou/gopsutil v2.18.12+incompatible"
+	"github.com/shirou/gopsutil v2.18.12+incompatible/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.5/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sourcegraph/go-diff v0.5.1/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.0.2/go.mod"
+	"github.com/spf13/viper v1.3.2"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/spf13/viper v1.6.1"
+	"github.com/spf13/viper v1.6.1/go.mod"
+	"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/ultraware/funlen v0.0.1/go.mod"
+	"github.com/ultraware/funlen v0.0.2/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/negroni v1.0.0/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.2.0/go.mod"
+	"github.com/valyala/quicktemplate v1.1.1/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/vdemeester/k8s-pkg-credentialprovider v0.0.0-20200107171650-7c61ffa44238/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/vishvananda/netlink v1.0.0"
+	"github.com/vishvananda/netlink v1.0.0/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936"
+	"github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod"
+	"github.com/vmware/govmomi v0.20.3/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097"
+	"github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190927031335-2835ba2e683f"
+	"golang.org/x/build v0.0.0-20190927031335-2835ba2e683f/go.mod"
+	"golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/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/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073"
+	"golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod"
+	"golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/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-20190228124157-a34e9553db1e/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+	"golang.org/x/tools v0.0.0-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-20181117154741-2ddaf7f79a09/go.mod"
+	"golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod"
+	"golang.org/x/tools v0.0.0-20190122202912-9c309ee22fab/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod"
+	"golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod"
+	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20200115165105-de0b1760071a"
+	"golang.org/x/tools v0.0.0-20200115165105-de0b1760071a/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24"
+	"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.24.0"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.26.0"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/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/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.0/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.1"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22"
+	"gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.1/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4"
+	"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"
+	"gotest.tools v2.1.0+incompatible/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/gotestsum v0.3.5/go.mod"
+	"gotest.tools/v3 v3.0.2"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.2/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"k8s.io/api v0.17.3"
+	"k8s.io/api v0.17.3/go.mod"
+	"k8s.io/apiextensions-apiserver v0.17.3"
+	"k8s.io/apiextensions-apiserver v0.17.3/go.mod"
+	"k8s.io/apimachinery v0.17.3"
+	"k8s.io/apimachinery v0.17.3/go.mod"
+	"k8s.io/apiserver v0.17.3"
+	"k8s.io/apiserver v0.17.3/go.mod"
+	"k8s.io/cli-runtime v0.17.3"
+	"k8s.io/cli-runtime v0.17.3/go.mod"
+	"k8s.io/client-go v0.17.3"
+	"k8s.io/client-go v0.17.3/go.mod"
+	"k8s.io/cloud-provider v0.17.3/go.mod"
+	"k8s.io/cluster-bootstrap v0.17.3"
+	"k8s.io/cluster-bootstrap v0.17.3/go.mod"
+	"k8s.io/code-generator v0.17.3/go.mod"
+	"k8s.io/component-base v0.17.3"
+	"k8s.io/component-base v0.17.3/go.mod"
+	"k8s.io/cri-api v0.17.3"
+	"k8s.io/cri-api v0.17.3/go.mod"
+	"k8s.io/csi-translation-lib v0.17.3/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20190822140433-26a664648505"
+	"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
+	"k8s.io/heapster v1.2.0-beta.1/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-aggregator v0.17.3/go.mod"
+	"k8s.io/kube-controller-manager v0.17.3/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
+	"k8s.io/kube-proxy v0.17.3"
+	"k8s.io/kube-proxy v0.17.3/go.mod"
+	"k8s.io/kube-scheduler v0.17.3/go.mod"
+	"k8s.io/kubectl v0.17.3"
+	"k8s.io/kubectl v0.17.3/go.mod"
+	"k8s.io/kubelet v0.17.3"
+	"k8s.io/kubelet v0.17.3/go.mod"
+	"k8s.io/kubernetes v1.17.3"
+	"k8s.io/kubernetes v1.17.3/go.mod"
+	"k8s.io/legacy-cloud-providers v0.17.3/go.mod"
+	"k8s.io/metrics v0.17.3"
+	"k8s.io/metrics v0.17.3/go.mod"
+	"k8s.io/repo-infra v0.0.1-alpha.1/go.mod"
+	"k8s.io/sample-apiserver v0.17.3/go.mod"
+	"k8s.io/system-validators v1.0.4/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab"
+	"k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod"
+	"modernc.org/cc v1.0.0/go.mod"
+	"modernc.org/golex v1.0.0/go.mod"
+	"modernc.org/mathutil v1.0.0/go.mod"
+	"modernc.org/strutil v1.0.0/go.mod"
+	"modernc.org/xc v1.0.0/go.mod"
+	"mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod"
+	"mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.0+incompatible"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner v4.0.0+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened libvirt"
+
+COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=">=sys-cluster/kubernetes-1.17.3[kubectl]
+	${COMMON_DEPEND}"
+BDEPEND="dev-go/go-bindata"
+
+RESTRICT+=" test"
+
+src_compile() {
+	COMMIT=${GIT_COMMIT} \
+	COMMIT_NO=${GIT_COMMIT} \
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	LDFLAGS="" \
+	emake \
+		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
+		out/minikube-linux-amd64
+}
+
+src_install() {
+	newbin out/minikube-linux-amd64 minikube
+	use libvirt && dobin out/docker-machine-driver-kvm2
+	dodoc -r site CHANGELOG.md README.md
+}
+
+pkg_postinst() {
+	elog "You may want to install the following optional dependency:"
+	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
+}
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 32165f939a1b..3c896ebc7f4c 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -5,12 +5,6 @@ AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164
 AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf48433a54fd34f49d2f4f95b5c6dd9e4ab1f40938c274be6be2e88cdb8959ecb12b4a86d07bc0a5bc86 SHA512 4356552630d1a154bbf369012c0315baf08b5b98ff6411d66ea3b1b039bfff5f105091b110e8fa1e64209eb0990038abda86d980cf2316ca97a5c10a43243df6
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
-DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c
-DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be
-DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a
-DIST slurm-20-02-1-1.tar.gz 8660993 BLAKE2B 8f3a6ce0177410ae25490bb995fc14696002a22a8a0ec82d97f697fe5898c8c7d07fe2ad4ab824e1056f3be59adb2cb30b3e89a50a529e786a59aacab5cc6673 SHA512 a0974f52a561dc7596a9a7aeea4f09075a97dc30c729e59aef625584264e5b4ae003466275be379bae42a2a0e0be0c910b9349d3e7c6631f18969518ac9a0910
-EBUILD slurm-19.05.4.1.ebuild 7964 BLAKE2B 448fb69fe8bf9cfe76329910c7bf14e5725fe3b19da23cee5cf7cd3f784e92d70477a881374cabc042679f2ac280ffe216814f4a402bb76101c3117ff7c06b80 SHA512 fe105bd1dd4797935fab2487f47bb57e91526760e4f7099624bafa42c916d0ffe2a839b8d0f75b45f01551e58d534ac5eb3a11c139cc072de87e8e224be50a79
-EBUILD slurm-19.05.5.1.ebuild 7957 BLAKE2B 6626fe4f6d3aa9de349c9526b8d267d06b22c0b77b3902c6d12d563f874d01984743e5f2d11e0c791d322f1f951115c8c750b8ef6bc75bc37efa686d9075746e SHA512 85308f3cb07b6db25391d23778999f3341705b40ee6b11c25eada41ceb8c62b5947be9e8ebae2fef37cc43e26e3bed6600d699ec94b867117ca0b91704fd6156
-EBUILD slurm-20.02.0.1.ebuild 7943 BLAKE2B 16bb5fa3d8fc4f7b4c4f514b4be8376127309c65a866cffd33ec524b97826c1d0b417f7a11a3a5d628c1b623f9ad54550ad337a0a8bcf0049d646b8b5321f725 SHA512 0c3c6e85f9018ce6cbe7c8bf35532286f808d1db95f087aec294b13c00568d367f2ceec642a38afc548d8b78197345ac2e927ba304d3339973a2c08bbf600a04
-EBUILD slurm-20.02.1.1.ebuild 7943 BLAKE2B 16bb5fa3d8fc4f7b4c4f514b4be8376127309c65a866cffd33ec524b97826c1d0b417f7a11a3a5d628c1b623f9ad54550ad337a0a8bcf0049d646b8b5321f725 SHA512 0c3c6e85f9018ce6cbe7c8bf35532286f808d1db95f087aec294b13c00568d367f2ceec642a38afc548d8b78197345ac2e927ba304d3339973a2c08bbf600a04
+DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513
+EBUILD slurm-20.02.2.1.ebuild 7943 BLAKE2B 16bb5fa3d8fc4f7b4c4f514b4be8376127309c65a866cffd33ec524b97826c1d0b417f7a11a3a5d628c1b623f9ad54550ad337a0a8bcf0049d646b8b5321f725 SHA512 0c3c6e85f9018ce6cbe7c8bf35532286f808d1db95f087aec294b13c00568d367f2ceec642a38afc548d8b78197345ac2e927ba304d3339973a2c08bbf600a04
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
deleted file mode 100644
index e412669c3edf..000000000000
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	SRC_URI=""
-	KEYWORDS=""
-	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-3 '-') # 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 ) )
-	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="${OMMON_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
-	eapply "${FILESDIR}"/disable-sview.patch
-	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/"
-
-	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/bluegene.conf.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-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
deleted file mode 100644
index 770a3e533907..000000000000
--- a/sys-cluster/slurm/slurm-19.05.5.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	SRC_URI=""
-	KEYWORDS=""
-	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-3 '-') # 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 ) )
-	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="${OMMON_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
-	eapply "${FILESDIR}"/disable-sview.patch
-	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/"
-
-	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-cluster/slurm/slurm-20.02.1.1.ebuild b/sys-cluster/slurm/slurm-20.02.1.1.ebuild
deleted file mode 100644
index a2a4e4bd829b..000000000000
--- a/sys-cluster/slurm/slurm-20.02.1.1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/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-3 '-') # 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 ) )
-	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="${OMMON_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-cluster/slurm/slurm-20.02.0.1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1.ebuild
similarity index 100%
rename from sys-cluster/slurm/slurm-20.02.0.1.ebuild
rename to sys-cluster/slurm/slurm-20.02.2.1.ebuild
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d60164cd44cf..db7fe575ed58 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 01cdb834f487..88fd78637a3f 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,7 +1,7 @@
 AUX binutils-config-5 12580 BLAKE2B d802830a52b76433152a073d5acb29afa606dcac6f41de03c138fb2178ea8118af6f7c8dfe22ee1b54b9d7c630d9661719ace12925f62fb033851a80c91fd0d9 SHA512 2909a98c1f4a49f952665b307121d3f263a2fb4b40b97d0393dc008b0a91f2b547b1cc104d78615f4d42a5e0b8e3b0fa20358e414999a2b14c468c0c69c2dee9
 AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c
 AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
-AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
+AUX binutils-config.8 2422 BLAKE2B 850b229c3c51c7687f303f723ed15f09d0d33730788aefefbb8840cee403dd287dae9380b3c60e22c0aa36ce519da8908f1d1b5e7bf4a79fc3c743a716086161 SHA512 d5f184c9a2178f94be216868afd79edf641fcc9c69a29ea2538ec93b03473199a2045edcf9f543c227de03ba986c48a61d86f0200b1a9d7defd393349ba79ad3
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
 EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/files/binutils-config.8 b/sys-devel/binutils-config/files/binutils-config.8
index 52cf7101e61a..e8e64de58158 100644
--- a/sys-devel/binutils-config/files/binutils-config.8
+++ b/sys-devel/binutils-config/files/binutils-config.8
@@ -46,12 +46,6 @@ asterisk.
 \fB-u\fR, \fB\-\-uninstall\fR \fITARGET\fR
 This is really for internal use only.  Used to remove all traces of the 
 \fITARGET\fR binutils from your system.
-.SH "CRUFTY OPTIONS"
-.TP
-\fB\-\-linker\fR \fB<linker>\fR
-Change the default linker for the specified \fIPROFILE\fR to the \fB<linker>\fR.
-Common names are \fBld.gold\fR for the newer gold linker and \fBld.bfd\fR for
-the classic linker.  Note that not all targets support the gold linker.
 .SH "REPORTING BUGS"
 Please report bugs via https://bugs.gentoo.org/
 .SH "SEE ALSO"
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 96f589135541..ecb484df6bff 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,5 @@
 AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b
-DIST bmake-20181221.tar.gz 558806 BLAKE2B 57759a76f38431120db4d01770440b301b1170b6d24ce38930020df483010c5631e4276bd63b90204b2a01a3853c7146709b9b8b9cf1e7d958158f589269e955 SHA512 7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b
+DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
-EBUILD bmake-20181221.ebuild 979 BLAKE2B 4d5c1d11111526ce986d3e42c8490085d515af4bf190987d9e5119cfcfdcc2922c9f322c06495e1c47ba5fa491044b7e2df11d2eb43b27e63c9389f01fc3a749 SHA512 90fb29c32f1d981bb803f815bf864333ed7ada9643588c1658e33174ea844f4c1de41df0a0d7ef82a0aed0f1d8cf2a9586aed40714c6b9ece49c4d83c737993d
+EBUILD bmake-20200318.ebuild 979 BLAKE2B 4d5c1d11111526ce986d3e42c8490085d515af4bf190987d9e5119cfcfdcc2922c9f322c06495e1c47ba5fa491044b7e2df11d2eb43b27e63c9389f01fc3a749 SHA512 90fb29c32f1d981bb803f815bf864333ed7ada9643588c1658e33174ea844f4c1de41df0a0d7ef82a0aed0f1d8cf2a9586aed40714c6b9ece49c4d83c737993d
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-devel/bmake/bmake-20181221.ebuild b/sys-devel/bmake/bmake-20200318.ebuild
similarity index 100%
rename from sys-devel/bmake/bmake-20181221.ebuild
rename to sys-devel/bmake/bmake-20200318.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 459a487fecf7..3a29614fe914 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index a9ad53dec3aa..a7a2f2cf547e 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -13,5 +13,5 @@ EBUILD cryptsetup-2.2.1-r1.ebuild 4231 BLAKE2B 9f5ae26fffc3aeaf88c3ceb39be1ebd48
 EBUILD cryptsetup-2.2.2.ebuild 4231 BLAKE2B 9f5ae26fffc3aeaf88c3ceb39be1ebd4887813246e667e64eb435463e56b28fb5f2d773f1bdf651e473275677bba072e0109a10c5bdc0aa2e5aa7e9253e85135 SHA512 358d8dee276bbc0979e29fc1267b877b4864cdbc5e9ddc06dfc5f8651641b7a8686352a48242797b732e2a6fc39d9594e15e1e60170183fa8d11a0fe8b9ea088
 EBUILD cryptsetup-2.3.0.ebuild 4239 BLAKE2B 1befc4792f7f4348319155bc6d6ad96aef8ebf5dc2df9974e9fb4a02cec82978901736b9653936918eff6d8c74f03a8e02a14ae3a5e19d5d956009bece0082d1 SHA512 2710235dc0b6ab62be7a4277a3a4ab64ecc2132085ef900d25935280129af0753a19fe0f0d0f77c48f131dd637e513d7d63339cec5bcc1d34914a57d0d16d6ce
 EBUILD cryptsetup-2.3.1.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
-EBUILD cryptsetup-2.3.2.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
+EBUILD cryptsetup-2.3.2.ebuild 4243 BLAKE2B d1d3ed8c43be333e29ad931093440e91fd7bddda08779977fb65b15479ae054e050cd524596374f73a4d65ef56d25b4d6bdba4580b4b9ba7bfcbcce15a2e7004 SHA512 a06261d7ec11971efc1280f498337f3ac4d031fd5a65de8cae6e3b638e04a1353831e90ecf55b40328bc562ed95cde2b9a8872ca8d5009ab682724dda17e2ebf
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index e9301bd41330..9a8386d18a97 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 70a8714db342..0cfb2d177477 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -32,4 +32,4 @@ DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22
 DIST LVM2.2.03.09.tgz 2476346 BLAKE2B 0987b19bc39ef218fe5a79d6035d6e3d5b59fc75ee94e401148f91437faedfa73295fcaefd97a7606ae9d158b000fa5de4e2a72e89da1e1ad27759f7b821489b SHA512 8540e46a6025ab14b592ccd9493b3224ffc0f962739a0a8de6d7b25c65c6ad96fc83ddb0e3d877b123a5e1b104476d0c20ccee2ead6d322257ec82ad1e3362d4
 EBUILD lvm2-2.02.187-r2.ebuild 9592 BLAKE2B ebeb2f0c206f0b3e60d6453ea0752a83bbcfb357bae033fc6f7f7347e03c0372b0865b49ade8dbcdf20be9badd30d1efbb2edddcebbed6b48ca7d17b5c5901b7 SHA512 58e16d4f395632826ed3e802f91852cf0519a315a419cd35dff97bddbf93b4ef38908cd6e35448762cd72f578cf429325b1a440b8f6f3c8caccc2be563ed4487
 EBUILD lvm2-2.03.09.ebuild 8902 BLAKE2B 36ce1a37c59cf5f48eecb984bcb0c4fd3ad248def8c740614605df8bcd9fdaef3b58cd7b4c0c05644c073f114626e136b5b9c4ec2cf020798431e5bd4901d5a4 SHA512 07f83e2fb14823a97c84d319a33b0764e565d6c77ca1f5a16c3e5b204452afdaf6b2676a6042ee82149f7665ddd9fa5a2a4c94f467275a64d36ceb6f0bb58eee
-MISC metadata.xml 1088 BLAKE2B 2a700b6a393a152ac23f47a4ded3e48a754527e0d0b819c57bf1e5ba19dd27ecb9ecc529435480ff522b65320db9971e200c79ea0da745227fdd63528bd43333 SHA512 2ad5b8bf4f1ce475dd211ab71aa603b655fda055fce86634a2adbfeda4aca454cf82ae5f67d32fb54804ef3463bd190c03b70fc9d893bbf15b4d6acdf2d64eaf
+MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 0761d9dca002..8fb1374ed335 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
-		<description>Please assign bugs to this mail alias.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 42bb21d17d43..9bd09f4f48b6 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,5 +1,9 @@
+AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
+AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
 AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
+EBUILD lxcfs-4.0.3.ebuild 1162 BLAKE2B 01e17b5e82b4c9c3969fa9694145a455fee4afc739c8f98fd8ad776d48b847c3382ab2a37a55fa51e177d5018dd0d7ad004a83f19f853da554351ae2a08e8ba5 SHA512 a291d1de3ff3d3c46d0016b0f2ea42dbe3a666bc3c6eea42d94fa5049e46d196f83595abcad76cd796b44cfdcfb1b84a6b02d43a5c971c3ba8b6e0891eb5d4cb
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
new file mode 100644
index 000000000000..ba443ee4b1f1
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/lxcfs: config file for /etc/init.d/lxcfs
+
+# lxcfs options:
+# -l == calculate container load average instead of displaying host load average
+# -u == don't display swap usage to containers
+
+LXCFS_OPTS="-l -u"
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
new file mode 100644
index 000000000000..d9368e4f28cf
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+	ebegin "Starting lxcfs."
+	/sbin/modprobe -q fuse
+	install -d /var/lib/lxcfs
+	start-stop-daemon --start \
+			--pidfile ${PIDFILE} \
+			--exec ${DAEMON} \
+			--background \
+			--make-pidfile \
+			-- ${LXCFS_OPTS} \
+			/var/lib/lxcfs
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping lxcfs."
+	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	eend ${?}
+}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
new file mode 100644
index 000000000000..2c44e836a2c6
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Omit all dbus.  Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+# acct-group/lxd needed for the fowners below.
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	econf --localstatedir=/var
+}
+
+src_test() {
+	emake tests
+	tests/main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	# Getting weird file collisions, 
+	# keepdir /var/lib/lxcfs
+	# fowners -R root:lxd /var/lib/lxcfs
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+	systemd_dounit config/init/systemd/lxcfs.service
+}
diff --git a/sys-fs/treesize/Manifest b/sys-fs/treesize/Manifest
index 91b479ee5610..00ec547671ce 100644
--- a/sys-fs/treesize/Manifest
+++ b/sys-fs/treesize/Manifest
@@ -1,4 +1,5 @@
-AUX 0.54.1-amd64.patch 286 BLAKE2B 2321c2fffb5fd3f92dcdb4de7a446b709857e0a9b6b8eaca4a8e82195e5b2df95c2527ac4c8dacdab30415d6995ac3e6b4128344c57642c373c156addd27c1a7 SHA512 260901b9ae35b1e85cbc761a34e042723b5d2ee000807e7bc0487202df6ee5a7bf19561649032fac898c649159f75e3053867474419732c31193dd075c2ce0ac
+AUX 0.54.1-amd64.patch 214 BLAKE2B b7fc27441ee03b0757cd876f8bcb3629c23227a0271cf1cb3329956bddae6f71e803c4f96a2c98fc42ecd481fd0c8a9bb6849a8c8001bff69ed97617f59625e0 SHA512 c4040242cd5d58eaf2f142a271ee7f4f7e80ff5c2e516953bd9e62027b78087b0a234cee269e37f447e4888634f6ca1b0769404663470cef686be436a477400c
+AUX 0.54.1-fno-common.patch 214 BLAKE2B a6b467f62ef1ab201897a303fc1afbee99dd3c7bb5333b70d2925302a1485c37299300724a88473a0ea3608fc5e1a0f6a304116ab3f919b3c6a72bfaa99f2ea2 SHA512 6516e8557a9f15d99b080a25d77757bb3ce68f90f72de9f5715e6166ba75839bf1a168cf4f0a860f3270589dc41df0573eff366b8a3f64bcc28ad3a9a3d916ee
 DIST treesize-0.54.1-src.tbz2 296047 BLAKE2B a00cdadc225976bc2cecb8e0e26509650c1a2707eaaa14b6edbbb5ee88871eaa5e56f164aa7285efa369aad77ec6414e9d025de31d1aef16c5910d9142fb07dc SHA512 461e3f6aa01127afd11b98395d65911f441012fcdaa3741ef35789d51fdb491731cfc62b5616150d74bbcbb8c2742561a387aef8ec4f9a493e9ce6683fb5fcae
-EBUILD treesize-0.54.1-r1.ebuild 456 BLAKE2B 7044a51c077ebdf06710ec8a68b0cd606a71ba1c849b9edf0fea818238fd91cff7b57aae55ecf9997b8f57939d39eee99bfcdb6589be7a475bd6e5259cf6b037 SHA512 65020fc042cc24427e2d0a917b51ff7226e4353047a9a177758cddba8a82548f2f53e8961f71dd3d023526a16858a9931ddd5081110f019d436ed3c049617f70
+EBUILD treesize-0.54.1-r1.ebuild 495 BLAKE2B 9c511427040bc3602baf5078067e708861639675af02c3f026c8379b2c8e3f0ac7a3ba7ef63028c34f54266b1713a115daa0ea1525bfe07ca848384587518f74 SHA512 965f8802f7c29f17c850c656570e307f6e7167da6b96c6a305b0ba72d56aefed820bc6811580312bd0d4eb076fe1be7bc3f2ea4d8659fb3bc63720b8274411c4
 MISC metadata.xml 245 BLAKE2B 379d9f118f924bb9c4fca6ccf376e9be6d26f243e0517922acc4a2959912dced4b592df9440699016c20a8a1280577cb7c71b0f744b66e46266c64955b66eec0 SHA512 ce493a808a1b4807488b017b1813c1ae857367457fec5fa2f27ba9bdb780f6aa431fe30e33a3dcb7574168ef9245305ea223a273c9e9f0557b7aa12bd02b5ef7
diff --git a/sys-fs/treesize/files/0.54.1-amd64.patch b/sys-fs/treesize/files/0.54.1-amd64.patch
index c03df8a258e7..dd45436e75e5 100644
--- a/sys-fs/treesize/files/0.54.1-amd64.patch
+++ b/sys-fs/treesize/files/0.54.1-amd64.patch
@@ -1,5 +1,5 @@
---- a/src/ui-util.c	2007-11-16 22:08:01.000000000 +0100
-+++ b/src/ui-util.c	2009-05-09 11:34:59.000000000 +0200
+--- a/src/ui-util.c
++++ b/src/ui-util.c
 @@ -18,6 +18,7 @@
  
  #include "ui-util.h"
diff --git a/sys-fs/treesize/files/0.54.1-fno-common.patch b/sys-fs/treesize/files/0.54.1-fno-common.patch
new file mode 100644
index 000000000000..7001b4ba8b37
--- /dev/null
+++ b/sys-fs/treesize/files/0.54.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -39,7 +39,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+-GdkPixbuf* gdkTreeSize;
++extern GdkPixbuf* gdkTreeSize;
+ GtkMenu *TreeSizeMenuGlobal;
+ GtkWidget *mainWindow;
+ 
diff --git a/sys-fs/treesize/treesize-0.54.1-r1.ebuild b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
index 315e9e86c23f..90940c262473 100644
--- a/sys-fs/treesize/treesize-0.54.1-r1.ebuild
+++ b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,10 @@ KEYWORDS="amd64 x86"
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PV}-amd64.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PV}-amd64.patch
+	"${FILESDIR}"/${PV}-fno-common.patch
+)
 
 src_prepare() {
 	default
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 0294cfe22e80..f07dac8b6135 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,6 +3,6 @@ DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.8.3.ebuild 4247 BLAKE2B 7346912021c1aece40acdb2d25f1eaeb64630fbb78c276fa8f76b5a51fd27ca816a5d7f990d7bebe6422648f8c001d4b343d3e0957a831904fc9c11d9eb2a714 SHA512 ab215e7b0ceed0f282022a36ecda3b4e6fe50913ae7684823a4eee987b9a11e11ad7755001cf47a737613216df550de391aef59230859b3ca89c0a48d074263a
-EBUILD zfs-kmod-0.8.4.ebuild 4246 BLAKE2B 0d6cee74d3051ff59086597a2e926db9b026a3071026f4d494e04d73a08b60d87789308d3398bee4038ad907b88cd1eb7e69b267d4dba0d44f5c176a5b4edfbb SHA512 d719db5a0fafd77734d31f42333a4695f97e4333562ba99c8b73cef4b81ceb001528e58db4412f5596a7ab54ca1d823ab00e8315fcee70360a1e3521d37f4774
-EBUILD zfs-kmod-9999.ebuild 4246 BLAKE2B 0d6cee74d3051ff59086597a2e926db9b026a3071026f4d494e04d73a08b60d87789308d3398bee4038ad907b88cd1eb7e69b267d4dba0d44f5c176a5b4edfbb SHA512 d719db5a0fafd77734d31f42333a4695f97e4333562ba99c8b73cef4b81ceb001528e58db4412f5596a7ab54ca1d823ab00e8315fcee70360a1e3521d37f4774
+EBUILD zfs-kmod-0.8.4.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
+EBUILD zfs-kmod-9999.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
index ea8054e8f0dd..8481dbb73811 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
@@ -66,8 +66,6 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
 	if [[ ${PV} != "9999" ]]; then
 		local kv_major_max kv_minor_max zcompat
 		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -76,6 +74,12 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+		
+		# 0.8.x requires at least 2.6.32
+		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	else
+		# git master requires at least 3.10
+		kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 	fi
 
 	linux-mod_pkg_setup
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index ea8054e8f0dd..8481dbb73811 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -66,8 +66,6 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
 	if [[ ${PV} != "9999" ]]; then
 		local kv_major_max kv_minor_max zcompat
 		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -76,6 +74,12 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+		
+		# 0.8.x requires at least 2.6.32
+		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	else
+		# git master requires at least 3.10
+		kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 	fi
 
 	linux-mod_pkg_setup
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1d40443e867f..c4ee7bc376f3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2a637220313e..650870257600 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-4.19-120.extras.tar.xz 17508 BLAKE2B 5d362f470d7a6723e9b1e38da2f
 DIST genpatches-4.19-121.base.tar.xz 3442844 BLAKE2B 7a2183312ff3f153bdb9b298bdb694b04965f0ecf4f2dfedd9cbb588b881702d616a864537fb4fe1a2d2668d26bfc7378251d6f8cc3b4f8b3142b60f51e03136 SHA512 5202f2c30e57a3a6ca8207c0069bec68ed57f1a2db348393c0308126faf36c7ad83d8f52835629e7264765e347edc2fb384267e76312622e51adefef3860b811
 DIST genpatches-4.19-121.experimental.tar.xz 6436 BLAKE2B 94a870004b5a1da7ea400c8267bcd0f5a709bd94b7554f6402cd0ce29dc578ca6052e38456e6c1a9f2e588442fcfb59d8816b253d6c270195b5e7c3eaa447070 SHA512 1f2dd13927bbf45b1e9dce316ccd70fe2dd3b795ff0f12d6bf99784813c8c091cc766ef88f85e8702fa4366bedc0c084e434ac3012fd71210bcfae7867dd8c2b
 DIST genpatches-4.19-121.extras.tar.xz 17516 BLAKE2B 1cb3cc5317a3fb06006a75c05368ddc20aa72bd266a5d602d21dff65a66f228acbc81dcfb4caaedd7b24539fac41a85237f90d7a33b92f0dda2cf35e02ecb8de SHA512 3f7c66ea6ec09f64dae36fea1bcddc91d00dd9a34610dadee647af68432a2593c452acd7aa7c5b59ecfcd92d3338f4beaba0ca4aa9bae0c8e43de1f0e16d8037
+DIST genpatches-4.19-122.base.tar.xz 3453776 BLAKE2B d2252398b81103b3147a63bc6fa37508833788d768c521b7789e75db745cd6c6812f399e938d6b23b3d7d18ed9b42d1469756cdcd62e186dba495a3368c5e5a9 SHA512 8b23ffa949cf402095560b8d8bc92b07516fba1072e02ed204e38a4098f8a480f5c0ea5367bfc00704c4b216fc51b975cece3376fe61cf97d43cb80e0ab61fbe
+DIST genpatches-4.19-122.experimental.tar.xz 6428 BLAKE2B 0cda23e09d7f4ad45f7209dad346df66963c8154d997e3b3117a371ffe0501e216d8611478d35859c0acef210e943212db5b376aa25a1cbe1d29b3f99aeb214f SHA512 a582495d3412a3189e8bc0fc4596244f7150ad285c0c29425a5908b2216b3578d81adf4b4cf57d60eeb01ae248eb1a17b0518710d0dac4001653ed1af67f909e
+DIST genpatches-4.19-122.extras.tar.xz 17524 BLAKE2B cf7b51b5725d83b0816c1f6672f336f42602d76a599e0450fe85edfde4fe1cc0ebe7b6c52bf54693b3d1d2f590bc55159b542fa8cb541d526e4e10027f2b4502 SHA512 43cd041bd87fc32cca4f641a18beccb3b34f6643cb1656e5ed2416439b91ddccb408c0c1075615056288193ba089c515af764b60f818a1dfd7fa54245434fba4
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b SHA512 d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b SHA512 d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b SHA512 294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581
@@ -43,6 +46,9 @@ DIST genpatches-5.4-39.extras.tar.xz 1756 BLAKE2B 5b79d2b75579aa2f660b90a0028939
 DIST genpatches-5.4-40.base.tar.xz 1387836 BLAKE2B 563a3ca82b3e6fad34e37530a9416559e0ede0730897c953ed67364c2ed4aca72e0b10050369779b4c85400784762ff1b672c34d56c0f044be7f28e62c0c2ba8 SHA512 45f02b016db58893b52e7920ad8b4b08bb924fa30df6d9b26546fced609c81f4aa4527026b1b3bb177267eca5e8fa38ad345d36ec1e2d46c2db9263682f05fde
 DIST genpatches-5.4-40.experimental.tar.xz 6144 BLAKE2B 4839ba6f1658f5e9686b3e0fb11e3b0a6508cd4bea71c0a3cb0c31d169ec71958ecd479e80130303cecfc55d7331be50193de1b20f511718105330798a5ff56b SHA512 72bf7e4c7979207876b52867b104d3f717bad23e42f0f29d3aaa3fd0dcff21c2fa8546e1870d942a9ccaf9196370d292f977d180ff2d3778eb2dafa26387c3d3
 DIST genpatches-5.4-40.extras.tar.xz 1756 BLAKE2B 546f44a21973cdce099df5f163c9c655b590c9ee7b2fdbc533f2586ef6b3995cd7348ff32378fda3a991c567000b5d5956680b35374ca1b990f2e1ba698ecb32 SHA512 bcf61ddc04e0673c68e025889264f67525a2c7d66c826dfdfb6e65b38f5c1d12a25e9d4aa6b01ebdd170ea6d72196f972df5bfc284122581e153d4fc2f69edf0
+DIST genpatches-5.4-41.base.tar.xz 1408488 BLAKE2B e83bde253dd5e5371827071cbeb07467661e978e405d450b523463d4698c41ba16dbfc0545f12d43f4d7db8d9bdb72aa044c6b40c95d97d982bb2e027b0c3abf SHA512 482d38feebc7dbb13d933d75001a108e4cf157ac2e575898c4c41ca508a66aa5626ab8a1c6f99504cddd9cd0828204f2f02a7899ef8c1dd0ce409ed34e5a06cb
+DIST genpatches-5.4-41.experimental.tar.xz 6144 BLAKE2B 36fb757f84aeb94b59502e8f596ebeccf2d8727920c89e4e2a1dce1d2bf5b86faa59d64164c19709c787b2fa1c8d7a55a871ba912f7f95af6d7c6f8cfdbad0bd SHA512 2791ce921eb53dba26835a9bebff0eb256ff3b7ec31cf0d1c54853b742792075992a3becf9f3bea40833baa7bbb438e936c9912f82820ab9322d98e7722b400a
+DIST genpatches-5.4-41.extras.tar.xz 1764 BLAKE2B 80bc79c567b36ca44bc168effd276d3c6fc22004706f505fe1cfa2828ea43bcc653346bb46e6814db8d2fc161c275fbf90664537ecc4e2b40eaa95e70b220a04 SHA512 ea21a4143b97c120b4d4a5603ee92b51411ae918c106aadc27ef09b97d4ece17ead3405aec8a962003deca161d5519653e503444056693214adbf4e6e3abab97
 DIST genpatches-5.5-21.base.tar.xz 767444 BLAKE2B 812732ed230a0605a40bd0a0d80bb64cf3582e0bcb94cb26e53aee7a69c0e66b200db8787abec14466287d9f9bfaa6f71d15d0cae56c5c820070833aa1996d81 SHA512 ed48a01f132d1dabc2bf2fe6b29156d1303cafdc53bcd843924f4ce14f6e0e35fc4d930b055b37a24365a6a31b36034d79f25112e1bd8526a6e0922e66dfc561
 DIST genpatches-5.5-21.experimental.tar.xz 5596 BLAKE2B 41a76e50012335e382643a9c0f1252f7aad1d13ab4b2b2b6c8e5dbed57fd298577e6fb6cb27b79fc56e408c0fd005a3df582a612a22fed0d10135cee71f32bc9 SHA512 62263423eb6a495535cbd4ba54a49ba87936ddea22fe5b20b27e729190978d301871770917576ef640324417786d129fc856043b4775e6e0d84c794ca72432b0
 DIST genpatches-5.5-21.extras.tar.xz 1756 BLAKE2B f277d12cbb65f109e49d96a47ba0a8429b2a791872b16548656db9f4275259fc774169a75f310edb7392b0c548b1ea7559eaa841376cb6a7c507cce31385cc37 SHA512 ce1c4b6ac121ecb6bbe1c738abd9ce967e4875654eb5aeb373f59e116c4b29fc2fb3f8383db6d093005ba85be1a36d1023780a35f27bf2e1c3bfaad15abdc084
@@ -58,6 +64,9 @@ DIST genpatches-5.6-15.extras.tar.xz 1756 BLAKE2B b28a36cb3ccbfb9b79757e1684535e
 DIST genpatches-5.6-16.base.tar.xz 305568 BLAKE2B 90609dd7eb9cda256927fbce372f24898098f933cccfb90d73f88ab0d6b4caca29b3f2e8d016eb344394e9828e5fd493f38b3b2c0f621fd08c99f54acff58fae SHA512 19b460551fe26dd7b7dcf929914710f0d7aa51bca384a5184518d97776e14d2ff40ae74e81c2d1f2c833e9a1b61cb513867b5243994dd54ed4aba62cb49291d3
 DIST genpatches-5.6-16.experimental.tar.xz 13688 BLAKE2B 0bd806869a83af9ddbeb4e193b9c80a2e366a259611241736eddee01d7f51e5691c4be8f57fc053a2a33a13ff995ed9a518889b715a3573475f01ce9508cdb22 SHA512 590f8ebcfc21446c5bb6b4a804c8ed782ea01efc1bd36cdba89682fcde6dcfdbf092ebd3de75e68eb1eca7ac3a372dffbe700c3dd66f72db356d6139ef78bcdb
 DIST genpatches-5.6-16.extras.tar.xz 1752 BLAKE2B 5d723106dfd00b958b1b2c59132d2443bde590175a55e3d6db73464bd8acd6284631eb0fef8fb552417ffb8af67061f7c8c4c5caaa53d703baf2c8fcd1319444 SHA512 aee1de432c1c329bdc847446ff07227a7352ab3f9ceaa03d87aa08abd51b9aa1146e4416c6c665a4958c2acf726d06993f116029bd6524a75e1eb09c923e2282
+DIST genpatches-5.6-17.base.tar.xz 337280 BLAKE2B c50a003ae3ab6f2208092ad8d0ec97217010d657c59ca329846ce8cb39a6ddf4a240e583fb5a589ecf8ddce8204a3697838c27898fabd37c6901678415155358 SHA512 0619fe7673207b79101437c82b87857d8d5e3b6cc31f169e8a072fb76a5ad0fbc67ed7a6f41bcec1d0561728781fa9f47f169b9a0ee94dad835d1c2faa660c45
+DIST genpatches-5.6-17.experimental.tar.xz 13692 BLAKE2B 49ab55332c03762d46cd264f3fd5f68866ee4e7a0489291bed1789eb34129bc81fa0e275bdcb153319873dd0b3a3df08d14930fa9d3a9fa22d62fe3bdffd750c SHA512 040ca3954ab063a36c95aadddbd89805d91e62267f7d4544680ae5144801d0f536ae7b887b4c5f19b0b3630fc4b451b704d8b59f3a2ac024d45e0d037c87b54b
+DIST genpatches-5.6-17.extras.tar.xz 1764 BLAKE2B a408294d6e54fe797248da1b7973a5cdb094c4e8f1bca2f9f20c162a1b4794ef54cb4878dbeb2919420b9e4d95eb0596c500438f566a818fd28792f715e8c6e0 SHA512 b7d5863f8876b8989234381a8b3baabff6adfe42415e77322168dc2755621d3f41962d5e9204faf87e108db161c702e754eee3128073c187dd0285bc25c25750
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -71,6 +80,7 @@ EBUILD gentoo-sources-4.14.180.ebuild 736 BLAKE2B cdec7e00ae10e09bb0e5bf3e3cd260
 EBUILD gentoo-sources-4.19.120.ebuild 729 BLAKE2B 293fd5c4504c7514cafa76da359835ed16ef486a3260b8530d2017636d9ccea4b25e498a5934c757d11cec3f04232c66daaff57fa53724dfbaae42f4de3dd7a2 SHA512 2f78ee6237d86516b4e27c0927e96e5b99c82fd8b9548b16f7b93e9e4e6d6998e2d6cf410b2457e5211d5767dec4b925c4e552c0740d260656c6f62b65b08627
 EBUILD gentoo-sources-4.19.121.ebuild 736 BLAKE2B 744a14832267f069375c82df209867b368517909f5375b4e69ec14b0e6543d871987b6f950dd899673d70e1270d3558c939c0d3dcd3ff7d4cb4df4af50e6f5f1 SHA512 3b86c8c298a18d3cfb1d3146e4161f97fc5dd7d55d9dd67580a3f6f7fde270fcd8fd66091e70f6f8eb7d0f1b7b181e9d55bcad78b70991830c60e510789ee6f8
 EBUILD gentoo-sources-4.19.122.ebuild 736 BLAKE2B 5a90e88eaae5d19a5bd1fa1fcff74f3be89a4a31bfcc2bdf06fea666e947466da4811155251ff8a20f2d550e3b40a1a0f883e1963a63d80999042dd457b12d4d SHA512 82d4930d296cc219b6e90d24ea78e247386584540432365f8d303965a1d938152cf6ddb61c8c8369201269a5f5e978082c8055cdf074c3b1b6533bd50cc679f5
+EBUILD gentoo-sources-4.19.123.ebuild 736 BLAKE2B 21394edea637554faab57f2ec118666f1223c261dd1e7b57941597305f72b9c14c5332c4dd91f5a50a67331b1be6ee3d6490a5a533d51be0ad8dbcd24bbd2079 SHA512 66eaeb14d7c55497f7e5f56b93ce7921a1cc693e35fdb993aa92540bd900a01d56c1a6ec1ae7c4d69b210fa01809efa9e7c59664a244dbecff42d45980ee6c05
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.222.ebuild 736 BLAKE2B 411205b642b4e0c1590a7367b10d6108a32d059fa8fbe3dedeae1b02031209079eef86d4e02130a667714748c76fea0a8eabe9d2071278de2229ea97938dc56e SHA512 62e973e3351ebbaf079e55671d2a43622d2b087d33d4b3dea21f4257d1a286b1be66b09d493cb54e3b49ae8458942029cddca59b48cfa5644e7710c5a73ce1cc
 EBUILD gentoo-sources-4.4.223.ebuild 736 BLAKE2B 437f6465ea8c36f81570c7ef10067160fab75e60a4a3f8797cd64a53a53c8d66e021e83e9eb8510c808749126ff0609750bcd26c6a87a9946a05785b3fe4e47d SHA512 00085cd2daaec79614975dd0dfbadde09f113f1000029e873388ae6f9005136a1a6b7b23ac13339424e304273adb3023a54ce11a90f8acb2aae5191aa5613edf
@@ -80,9 +90,11 @@ EBUILD gentoo-sources-4.9.223.ebuild 736 BLAKE2B 16209683a051838d74efd9dd54b84d2
 EBUILD gentoo-sources-5.4.38.ebuild 728 BLAKE2B 6546a7a7b36a8947452844ff1b1fe0accaa15f75b298a3067c8d01ca88da2dcb376806918ad69d15b000b8d42078f2d49d5601d1e3a866f8fe540cb233c3f46a SHA512 a2e7a90ed18991b3e9bd610b6427a801a7df65b03d165d6addb51a3400c97fa392f6e4c07e7ac86bcee01825db3b120bd112d36a056c3d26a551dc3278a83bf4
 EBUILD gentoo-sources-5.4.39.ebuild 735 BLAKE2B 51e3b8e7c9226e82a79daf76c34f0fd35907f1fc57e4d79a20a423fd3ea6c079ccb59ba9ff7517691884e63dce73a7f5dca3b8921cc08a58f706ee9ee754993e SHA512 a314530b12bc2b16fa5d6447fc396a759274709ba4ffade973ae26da293c9ad5255baedfcf881112e11b3f281b9acab5f00f50fa5937012d6c22828d668a5e1f
 EBUILD gentoo-sources-5.4.40.ebuild 735 BLAKE2B d2e9e8d2ac227e71c63fa426ec7e41837b4e902ceec7b8aeffb0821e602de7729ba188f9b99c714a5054300df8cc71b5d13f6a328b17d99e23d1329e3db16f7a SHA512 4f35a1e804b3e18aecdc18c02b953223871205c2896d7dfe7683d62370fc30e290f428ecb67904e93c5179d5571ece88caf1237ecfff6b8f90438035e88beee4
+EBUILD gentoo-sources-5.4.41.ebuild 735 BLAKE2B 4fc3376edda1e7a908bce1b898ce1270874d0f1468c775895956dbcc3acdd4c97da4682447dd831422a545c68197418e60f5a149e4eda26dc91b9847aa04ca15 SHA512 2b5864b76492d5aae0a8b7fc938013d8fcaf455554d50e8633c4aaae121602b189130f4356012ffe5572513a34dab8da351056bb4c3e77d782c3f353d3b6fbbd
 EBUILD gentoo-sources-5.5.19.ebuild 735 BLAKE2B db28f4bc1823b6439d9fd95da850b18afb4defba0d321e75d4d425f61a1a22cfa8d33cc29d8afd40732a16ba2827d2f235451e5ed70c2d6e5a363884390b2f6e SHA512 86ff4d97323814690dd974d5d5f2c0abafe85b49bd340995c275f4d58d1a3d38fd1e0742165889c8a3f166a0440626c8e1fc8df90190ad60445bb5029097dacc
 EBUILD gentoo-sources-5.6.10.ebuild 735 BLAKE2B ca4969bd3812fa181b282d913834d910d0f194ae5964c641f1a7657fd15c97dd1e749f5a0712c7ba20e3f16127b864ddc949ee860009a31776dd86d7e383a492 SHA512 1f2cf508c1e5662dc3f432b6ae17abef9e312beaec92660c1cb0e54da3dc625c2934099649632e835f84350cbf5c848c67b291fa4cd342b65f636902dcf6b4e1
 EBUILD gentoo-sources-5.6.11.ebuild 735 BLAKE2B fb6f0d803f17314707fdf42aec41d3eaba2270cfb69b5b3b2c79d4186f110859981417d7db58ac884487c1f8006f00397b69e200978458a4a603a8888de0a1b1 SHA512 cbf9fba0bd24919a39bc8f8c0f441dbf50d510750eab21dafb5ae86f67dd94e94f623e7253c076b6cb9fd3c0e99e4c6efee9e701dda4fafca8cf6f993d751f24
 EBUILD gentoo-sources-5.6.12.ebuild 735 BLAKE2B e5fa4cb89810de803f1d5a54910c7c9b50c0b979fc20bb793c471b40e684bd4d4b8e2cab6d03fd9a47e6d8611d120ae2d749f8880d6cfd9db566b11d864daeb4 SHA512 f2776faf16c53a4c2ba085c92069e516b21f675dc71f802f8b613f89108e5ac7c889b3831560a2b3e81391d51b508c0bf59e8745dba015e036e6d72573131932
+EBUILD gentoo-sources-5.6.13.ebuild 735 BLAKE2B 96544844bb1e7af0746cce832af9054b47635c78095233a020dabf78a1bf3a50e1eb3a5908604f390897510cd359622d008e0746de1d4ed5e94f874dea5b2253 SHA512 8f3cce5ec257435f702c1c109518490f16a2109d7ed40a41e7ce65951ff04b46f51a6568fe35d5bb6c181127a6534cd197ff4a36a49c7d3de92f87a2751fb2f8
 EBUILD gentoo-sources-5.6.9.ebuild 735 BLAKE2B 07f85b3f10c5672309f71378fe3e8f63009000aaf5fed2ee7920ae09884f03fb69fe5ce70ef193b2e97563c5e69cdf81c9459b86e1a0f53005b02e1b6045af61 SHA512 b6ab9ad0a6813678aaa7cba37783d06885a0a1e221bd66a4f5a514486b4d23100941d07e5fe06ec93c3ca2c98c55e670028675430597f6899c086e4457ea056e
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.123.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.123.ebuild
new file mode 100644
index 000000000000..c3771cd8a6c5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.123.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="122"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.41.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.41.ebuild
new file mode 100644
index 000000000000..90fbaec02a37
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.41.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="41"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.6.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.6.13.ebuild
new file mode 100644
index 000000000000..f89062030d0f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.6.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 994d28938131..07899e844a62 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -15,6 +15,7 @@ DIST pf-sources-5.6_p3.patch 766739 BLAKE2B 98ab84a2e3c548989c06f6a3fd48fb35c2e5
 DIST pf-sources-5.6_p4.patch 848431 BLAKE2B 3313a8bb32b8b6bb79dd222796bd644a62cd792660fd04bff5e749800bbe4145b17d2131c002ebbd9f0ec7879e4527e4d5b7e38a625e3b08f66333920093c3eb SHA512 0df2c8ee0ea4d2aacb6c68e33b1234b0abc68be0a72198f17b59d5f71ff277f61a30e8ab5fbb472674470b4259eec716d8f071b62157248b5b60544e64a87bdb
 DIST pf-sources-5.6_p5.patch 861886 BLAKE2B edf1ea471d36a0a2bd715fd8822dfbdad475642ab7896c4583184d8d15d050cdbe7875d12d881f8cc71ccc84149cfda4f20c3f9580d4a87240be5f3fab2c4563 SHA512 b1b560737e20ffe6495c9e87b3ba265d7ba8d494b0572b84db74c76c0de5736e0260c917cb7f43c33a08d611f30e94fe7d438d0cfb9ff05fea0d5bc870eb8665
 DIST pf-sources-5.6_p6.patch 1218338 BLAKE2B 4317b9f195fed9e6ed0fee9532a6a878586e501c8e96b584449c18870b966f4e0a105eb3f54f904d1a4aadac3ca67a80d8613c675124ca09dc374d08138083dc SHA512 c760611142a35ddacc8b85520d7de3ed4c69e13abc6775ddd84bcbb58485b5ec5001b1444b858a48c68d4a9f417b4e1a7aab59913e34107987e7897be9bdf97a
+DIST pf-sources-5.6_p7.patch 1519043 BLAKE2B 73ad395b6437920d35a3a695e5adbfa311a4482632e8678daf55ca2e23ed00907be9af725dc1fe44039a66533a74bf98b0bfb15756f7d144ec08d2fc861e8846 SHA512 2d14c4f892433ab95bac2467ac805cb822888d792c005bc266e71a86bbc1131e59dcccee55514cae0d69c2935bbd6ee6bfdbd7bba32e306a8b568423b8d7bab5
 EBUILD pf-sources-5.4_p6.ebuild 2003 BLAKE2B 142c2a4a03bb26454d46ff3e15bd55e3ac41fa907e660fd648d4a3064a3b0b1b2f9465fb44b6259a080910dd9c233adffc8986c572a714cd2867fa912a5d39d2 SHA512 07022c9cfd032c9841537103eabfcc5fcd8aabc7b9cdc352b953101b254c5319d09c7bc17bc3e08df050494ca5634c44ac04a19dcb740126094d3bb7a7c7d507
 EBUILD pf-sources-5.5_p8.ebuild 1954 BLAKE2B 15c4bd2a69604a36546318261ce7a8de97ab6e78994e8614e72ea6c968aed2a22389557759ab7265a2c0f4cdd5c29e68a82143b6ca23594698c1e9f0a844f4b9 SHA512 0de23fd94dbcbf7e9050cf8399f09adf5b1e2fad6bf12b9c6ba05805e251f0c3d3051014379d6b79cc5f443d6726bd5dea87b1759674bb535b3cfb3dc22a6524
 EBUILD pf-sources-5.6_p1.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
@@ -23,4 +24,5 @@ EBUILD pf-sources-5.6_p3.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666
 EBUILD pf-sources-5.6_p4.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 EBUILD pf-sources-5.6_p5.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 EBUILD pf-sources-5.6_p6.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
+EBUILD pf-sources-5.6_p7.ebuild 2043 BLAKE2B 57f79f01bb1042d096af5450a29267e1666a200d95c051a66bc99023f19bc02dcd384eb66e341ccba5a43836fcc9bf8399c1dc81dd4c2d027b9ba1ced7475c51 SHA512 a6b525f0e6035eb160e374ba9aae21840ef1d9d082386af5decbaa3f80d497169413c5875b1840135b7134ffa18bb2368db6791799214626abe8bcac55f2fe45
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.6_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.6_p7.ebuild
new file mode 100644
index 000000000000..e140e5f7329d
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.6_p7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="2"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Temporary fix due to 5.6 iwlwifi mess
+	find "${S}" -name "10*linux*" -delete || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index af57ba649689..3746824cdc95 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -39,15 +39,15 @@ DIST patch-5.6.10-rt5.patch.xz 158468 BLAKE2B 8b82e0fcaf5f79953d95355720893fbeb8
 DIST patch-5.6.10.xz 265024 BLAKE2B 10e617b637617ec384acdaea6566f1500ceeed6bf6682f363304db50befa89f43957d903ac9141123fd408fa715280e5fd1fa776ed233b03b41232e73bf05d50 SHA512 57860a7576149a34c1ff9277a8daee8d4ee8574270561302e4fb3916a7f4c23cf298a3a7f13ba5370ec665548b679f5340d3ce6788152b4d8d79f41009efa865
 DIST patch-5.6.4-rt3.patch.xz 158852 BLAKE2B dcf9255913f52d24ce6487a879e03f69bb9e21120f31253762e4812a5cef4fa00fbf9ad24a0268ab87b0a4b1946bc50abb600f9b8ff77dccf8f969e3eaa61eca SHA512 aaeffff8d6fc9d95aea3b08cff0e9b56e60a65029d5440aa16fb19b6e4d288c4a31789fb751dfe94424ad69320fae67d6ae94014334a653fb8a8e138e296e847
 DIST patch-5.6.4.xz 34744 BLAKE2B 856148010fefa7e45903da23a054429f924920f1fd331b725d00906baaf6a05fee769c5c780ae6548b4f02846f945b12012c1216411c8d92aef7499babc42528 SHA512 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
-EBUILD rt-sources-4.14.170_p75.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-4.19.120_p52.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-4.19.94_p38.ebuild 1462 BLAKE2B a2a08dd54d5a40f8d7af54df6505b9ca069e5dcf7a5d23a7981558dd4dd8ee6cd883c703fb1025164a0f939d6d8b168e9dcab1730ca0af0cf623507476baae85 SHA512 4c1af8976955ca427013bf0f2713b34a82f3cfb01e73376b8daf8e8054e40651a2bb4485d5ec6cd28c60d7aa1adbc345157eb00d921dccb24fafbffd0678a5b1
-EBUILD rt-sources-4.4.215_p192.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-4.4.220_p196.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-4.9.215_p138.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-4.9.220_p143.ebuild 1462 BLAKE2B 312a162fc3540c8c113732f29156060b2787bee89f93e4737e070e9d36599d915d2032b0a2382bca9b65c4e274564d79404fb40b13809fefc3a9528971f54d43 SHA512 03dc21a7611985b779a014cc003272edab79a0296fdee56fee82dfa60ff3ceaa0354e7d969cc89f51d61cf7e6abcf32063566fb1b09c2252505cfa0bc49ac1b5
-EBUILD rt-sources-5.4.13_p7.ebuild 1457 BLAKE2B 74462edcb1da0118992c44bfe424446a0df5b92f39d211b2dbdd773462e7e45a8138de2c3443e6b2b0f8187505dc07c48c736b8ca82997f367ba35962538d808 SHA512 83abccdb699faba7952802f2c6fc141f72759c63376294d19b5932f5e53583e18dd7bc2dc6b30565dc327b8fe73aad8b7e3b146692034384f7038fddb2974ec5
-EBUILD rt-sources-5.4.34_p21.ebuild 1457 BLAKE2B 74462edcb1da0118992c44bfe424446a0df5b92f39d211b2dbdd773462e7e45a8138de2c3443e6b2b0f8187505dc07c48c736b8ca82997f367ba35962538d808 SHA512 83abccdb699faba7952802f2c6fc141f72759c63376294d19b5932f5e53583e18dd7bc2dc6b30565dc327b8fe73aad8b7e3b146692034384f7038fddb2974ec5
-EBUILD rt-sources-5.6.10_p5.ebuild 1457 BLAKE2B 74462edcb1da0118992c44bfe424446a0df5b92f39d211b2dbdd773462e7e45a8138de2c3443e6b2b0f8187505dc07c48c736b8ca82997f367ba35962538d808 SHA512 83abccdb699faba7952802f2c6fc141f72759c63376294d19b5932f5e53583e18dd7bc2dc6b30565dc327b8fe73aad8b7e3b146692034384f7038fddb2974ec5
-EBUILD rt-sources-5.6.4_p3.ebuild 1457 BLAKE2B 74462edcb1da0118992c44bfe424446a0df5b92f39d211b2dbdd773462e7e45a8138de2c3443e6b2b0f8187505dc07c48c736b8ca82997f367ba35962538d808 SHA512 83abccdb699faba7952802f2c6fc141f72759c63376294d19b5932f5e53583e18dd7bc2dc6b30565dc327b8fe73aad8b7e3b146692034384f7038fddb2974ec5
+EBUILD rt-sources-4.14.170_p75.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.19.120_p52.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.19.94_p38.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.4.215_p192.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.4.220_p196.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.9.215_p138.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-4.9.220_p143.ebuild 1469 BLAKE2B 7ddbf85e96ce82b215b9ad42f157a87cebbb773d829e5871fc473548d56d8abec35a819f1b3a0ca24ec05152d490ae60b8e7c5996ee6e2bd3805f87a418871f2 SHA512 b728ce92752479f646a52fd4e090e78c8b0fe3a40a6908d7f57077be945684c2a27d34728e17372132fb836ae3151674a4b6c9970ff54e801863ec328cc4c7c3
+EBUILD rt-sources-5.4.13_p7.ebuild 1464 BLAKE2B 066cd79f0f379f0ac140e15f8d59275dde5600dfd70901d6f355a2fcf872736f643d423355f218106c8807b99526306cc71cac0b5d7a1d109619c1365fde45a5 SHA512 e85ecfeb4a4639f76f940c9da43f88ac6c83ad02f85e55aa062c325926a29cd8e57b398372e18160d3b2205547c1a14eec2fc6b2073523e45e2798555e0b3ee0
+EBUILD rt-sources-5.4.34_p21.ebuild 1464 BLAKE2B 066cd79f0f379f0ac140e15f8d59275dde5600dfd70901d6f355a2fcf872736f643d423355f218106c8807b99526306cc71cac0b5d7a1d109619c1365fde45a5 SHA512 e85ecfeb4a4639f76f940c9da43f88ac6c83ad02f85e55aa062c325926a29cd8e57b398372e18160d3b2205547c1a14eec2fc6b2073523e45e2798555e0b3ee0
+EBUILD rt-sources-5.6.10_p5.ebuild 1464 BLAKE2B 066cd79f0f379f0ac140e15f8d59275dde5600dfd70901d6f355a2fcf872736f643d423355f218106c8807b99526306cc71cac0b5d7a1d109619c1365fde45a5 SHA512 e85ecfeb4a4639f76f940c9da43f88ac6c83ad02f85e55aa062c325926a29cd8e57b398372e18160d3b2205547c1a14eec2fc6b2073523e45e2798555e0b3ee0
+EBUILD rt-sources-5.6.4_p3.ebuild 1464 BLAKE2B 066cd79f0f379f0ac140e15f8d59275dde5600dfd70901d6f355a2fcf872736f643d423355f218106c8807b99526306cc71cac0b5d7a1d109619c1365fde45a5 SHA512 e85ecfeb4a4639f76f940c9da43f88ac6c83ad02f85e55aa062c325926a29cd8e57b398372e18160d3b2205547c1a14eec2fc6b2073523e45e2798555e0b3ee0
 MISC metadata.xml 425 BLAKE2B 4550a69c8caa253029b71eeb5d7c408e986250ffa876b84bb427bf1f14b800ff7f090f03be3b064af231b94bdde92591bb9fcea64ff2f3f92e3d68462bb0ec6a SHA512 697c4045761fb0e516cb64e97a817f6b8b36a86d0cf982eb0df746011837163bf8810b85241580cbe7bf98202a4dd2e69142422904488961512edb2343fe2536
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.14.170_p75.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.19.120_p52.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild
index 81de15124099..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.19.94_p38.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.4.215_p192.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.4.220_p196.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.9.215_p138.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild
index 393e767438af..8cec2aef7c8f 100644
--- a/sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.9.220_p143.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild
index a641de8f2850..12c5881dd444 100644
--- a/sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.4.13_p7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild
index a641de8f2850..12c5881dd444 100644
--- a/sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.4.34_p21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild b/sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild
index a641de8f2850..12c5881dd444 100644
--- a/sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.6.10_p5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild b/sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild
index a641de8f2850..12c5881dd444 100644
--- a/sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.6.4_p3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 ETYPE="sources"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
 
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 156679775d4c..cd6a7d4b4eb5 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,18 +8,18 @@ DIST linux-5.5.tar.xz 110713660 BLAKE2B 36b990d3650c409652206c319c93c0cf68885334
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST patch-3.16.83.xz 2681736 BLAKE2B dda3a24456fa0fa8a1797e5fdc552efd47b40df823167845587d07cebb6d38028c7ae59ac52b77a631895a8c454897a239253fe22cc30d4f1ec0335ac9f1b60f SHA512 d98b055c5d17e61a21469c77a974a8fa0c091268dea4f332a029eab0f0298047bb686c7022ae43c13b3f3e7d1cc09e1f5faaf5aeb2cbb2ac6434031de6bb7ab5
 DIST patch-4.14.180.xz 3628740 BLAKE2B 9c44da181dc962472ecd3c477d0ff91739a1f5a3c3ece86433a9d4171247d3ec49d03b8a190e3162c4f874083400d2e44d2da1dbaebc288152bf9488d49beb20 SHA512 5fa1793b747ac36119d8a86737a3d2af22ff38a2d25f845231aee8b558ed5f9aa56ade27eb2a77de38065d7f9765a26215c0872cc2d59e872d658eeaef299f9f
-DIST patch-4.19.122.xz 3048300 BLAKE2B 667364f22660c8d7288545356f0c4cc5360dfd3d918a1a89ce1a75b08dcd7ac228756cece81762c0abce6136f5fb4721e1c8704bbdf2ee57d86f728c9d8b0f36 SHA512 47dabb8eae44f7b32f143f2aeb8877bcae684d8573ccb63fbbfdfd68d48312f224b7da7416c558740c9d88e55db97d4b84071df08155c6a4c0707125506a8227
+DIST patch-4.19.123.xz 3056924 BLAKE2B b747a22847bf3c3ae6035bde1ba18cb935ff560c2716a4ec1f987de84a284696383685c2ecd59ffa4f6b2c8ba77751a50504a49d11458433de0135da4880a7d1 SHA512 f3f9deda34647bb2d4efc8b6028645422d0dd1964d05254cafa6e843144c39d3e151ed6ab717bb6c567a79d17f1e754976eeb78e968a0a2a8314e1398e4ce6b8
 DIST patch-4.4.223.xz 3149492 BLAKE2B 68af2f9db8e2dd232f1602bde8f8dfd3552c8014ab8d2570f75eb459ffa942af5c07fbf2ec7134123445f30e2b87977e3c6142243f58c783a6d1e01059effcae SHA512 e958d7212db0ff5a33923b77a7c85d1aab104fe8c066a857569009065867b6f0039cd5f02e2fc4ec44948e79a59a4ec572bb96cb20cbfe0995c884a9f47ba1e3
 DIST patch-4.9.223.xz 3451504 BLAKE2B d5145ada4855fa1f27224403ec67f3830f2ff2fed9e59ce5d7850315b87c95525e506b3da04fb515b0e4e31af732566008f337223d93bdca8fdc1ed673a9054f SHA512 ae36d5b61d4dcc4695a597e858087103e833511fe11d7674d9020a7e33c19e3fe6aa8e571f20174764a8c3d9c18ae961b3d769ac66c3e05e88ae0cfaa1bc8ad3
-DIST patch-5.4.40.xz 1309032 BLAKE2B cb06b3177762c5401801e71cd089f6f40f2582dff9b00618f3647152d70813bff0c5a7c6cd9bfdccd5ca5ecc7be3f57aafbd7d5bfc7e0fdde27dade1e189bb36 SHA512 20c19808a7e2af62ea93a4ae187db5e80078da8c4b268424c8d6f945a98eeb0ce7b1f09086813fbd9a9220ff5f062c1fcb8292abedfdc7f9d23a2d804898cd16
+DIST patch-5.4.41.xz 1327972 BLAKE2B 4e1c95d681900a6819cc71cd4a0f895f1ce99eb592491015184bd7785e04b799d492cf4cbce36329d8a2851e0d825078acb836fcbce22ee705dce572f261afc3 SHA512 a21cbef99a5709b97dd8402ac7c2a5637f8af9db6b0a791ed5c0fd24010a0d7d5074635167078b3c5f2a393345e6ec84b35129e6c640e933609920a98b744d5e
 DIST patch-5.5.18.xz 722692 BLAKE2B ed9b7e15ebb981698e34d2e7a77ba8ffe65287672418221a6303195ec45f49c420434009cd5cfac64cad2685d7630aa017aaa3a20d4c788006872c1af700e438 SHA512 2cba5fcc831f834e7f469de12a99fd25290caab563db23eabe4f7912e2889e097e61400a3fb24c77ec34c3b4187a4dd397ad6b40734c8209c1a928d749585977
-DIST patch-5.6.12.xz 294016 BLAKE2B 08199e34e7524c23bfb123396c03200198a7a96b8a3d0e8e3c0ac2a1d979879d32f1816f26eaa00be7a263fbb4a6d1b3997cca43e0084b2ef4357ff1ec408520 SHA512 e057961567d8482482ce8e27467b4fc47ddff604a3fd47f5e4f4092a29cc9ef5d180dd739f3edff91ab373108b699c04e55131722e8d4f153f4dd7e7833b48cd
+DIST patch-5.6.13.xz 324636 BLAKE2B e04f1c4f9ae037b3a06f28446e782f7aecdd54907e4d05862ca913265c2d738fc114727a36603bdea3323007637568682a3696dd375028c09ecdaa9f84bbfc9f SHA512 10eabe59db21b0d82932b8122d3f07f12aec435900350a6d7f3e281676a1036860e24284252425c5b08fea02215166e3f65c49e5b4af8dbb7e03bcfbc6a86148
 EBUILD vanilla-sources-3.16.83.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.14.180.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.122.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.123.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.4.223.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.9.223.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.40.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.41.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-5.5.18.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.6.12.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.6.13.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.122.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.123.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.122.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.123.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.40.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.41.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.40.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.41.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.6.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.6.13.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.6.12.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.6.13.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 46096ce27086..90d8f1f907e6 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 90e1271c92bb..4a89319564eb 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,12 +17,11 @@ DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811
 DIST glibc-2.31-patches-4.tar.xz 40464 BLAKE2B 8c79b446a37be8f33c10b9fe987d2f55f285bf672a48bf307b60cbc322aadad1eec209b8d2ab88c023fcc718b08d089a151797e2b7352672234044ccd5eb9a9d SHA512 385de24a814646af3c8504ac1b76aa9d8ee5043d1e666656f7b31fc4a66c32b7c2a7b361b1a77e910182c07ff44bb1d228fd8de13a1915210035cad71251001a
 DIST glibc-2.31-patches-5.tar.xz 52720 BLAKE2B 0e4315a79d4108e8a0eb2d849086de40a3ddebd9c09592ec5ecd02d9a0481f58588d7fca345624b0e345b077f6f3ad4257fb5949a0f05be2a004489af585a329 SHA512 c081aef22efacac19ce343ad6e55b8102869c42142dfd478e1cc03e85d6569771b52b737173df0996e273dc6ad1e8dea391658e03d5bcb69f2ed754801b3f6fa
 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
-DIST glibc-9999-patches-16.tar.xz 17736 BLAKE2B 772f5012ead8e27f5cf5fd2613de9a76ead2128ecd9324cc499e677ea3a96110cb0d4b1d3f12860ffa1267093db310503d7d873fb95060b0c1e046c6a60601d0 SHA512 eb885b7743ac88df7e9eb3a1cd415bc9eabff1c6bd00d32c4e50f1d9dfcc32419eb72ef06749b279d5b80a200a83bc951a851b8c96a023ab09a8a0c28045d563
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 EBUILD glibc-2.19-r2.ebuild 38287 BLAKE2B 6537e90257900cfb0abd28c3391fb530fa24ce74cdcf870ce340f8ee605b941550329120b1598266ed9ace251f5d12980a20d0297c04fdff633ab92baed66ed4 SHA512 7082dfd299db188b9fad3a3807e723d7b274520cb579b8681030b10d8807520ccbc960ac47d03ad7c6788add345caaeae894e2f2bce2bc1394e564540707c488
 EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd
 EBUILD glibc-2.30-r8.ebuild 42896 BLAKE2B 874f872895509e5bde1f1d08797e8b594d543970e4f48f7cf17890dd14a82d0691b8cd14631054c7c1b180f3189e1a67e7101cdcf4a01a587bfce38cc66d9d8c SHA512 351f515f0fcd4525b5913a912e172575e33d63afed65db7722706296ed712e42dabe9d3c936a0749d9c252b092d5e273addd2390971228897741c6955e7d105c
 EBUILD glibc-2.31-r2.ebuild 42977 BLAKE2B f0835caa912c06b3c94c679f521c81d74213d906c9b1341a29f3c858fcda0791e090962aa2fb3e196111ad92b48c860f7d7368c66e2fc7b98d8e5294c71a3a17 SHA512 1d0d0cd31d4fa5e9f14fea2571f32fc86b1a458a7ac083db8b7a13d29817dcbfd7264774d672bf38529c19c42903bf838cb5cb72f0122e7b4b0e88702bcd6a26
 EBUILD glibc-2.31-r3.ebuild 43185 BLAKE2B 18ae13d0a03d4618781a8754cb4220f53b7060e7830d4fa27865d98e36521079c34905a6796e5ea43677c368e94243431f62ceaf5335f13b52c61c345b7b6e66 SHA512 df03d3eda73034de7b036088a0d14363b3f80a6da704c5a4bcf27722553d0a71a11a328583a6c4d21aac1dbb167d1347eeae978944d9733e7138cf3c86581a37
-EBUILD glibc-9999.ebuild 43238 BLAKE2B b180676fb42887e4c66517b300415454f21a00d17a46ef00983bf413fd8b89c76def7a54016384af03859931884d5011eeab359234166509dcd8e846e8ad0849 SHA512 acd5345517c4998dc0d6d577dc68514409bff6358855dff127ab69f9b11f9f6a0ab00b3c10aae16846b1cd9f8bbd056bc99eb67e4063136e40f80ac20fe9ffa7
+EBUILD glibc-9999.ebuild 43587 BLAKE2B e5f435cadb40355599c97080bfb1ba2dd42c199ec5f3f0e460cb981332684b2947d277e70c8e5b058470084652aef26ce6a62140eabe3d6da5d3e285382d43c5 SHA512 97abfbf18fd8c748a016c7fc33e5af26a3ca1ed6adab8ed88beb6bff28016862d0cdaa7fd5ebecb98ffb2539450033546ddae770c1824c9be5bcec0c2dd811ff
 MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index cc1528ef61a1..bba57f5d6075 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -15,13 +15,17 @@ SLOT="2.2"
 
 EMULTILIB_PKG="true"
 
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=16
+PATCH_DEV=slyfox
+
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
 	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 	KEYWORDS=""
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
 
 RELEASE_VER=${PV}
@@ -30,11 +34,6 @@ GCC_BOOTSTRAP_VER=20180511
 
 LOCALE_GEN_VER=2.00
 
-# Gentoo patchset
-PATCH_VER=16
-PATCH_DEV=slyfox
-
-SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
 
@@ -724,21 +723,35 @@ src_unpack() {
 
 	setup_env
 
-	if [[ -n ${EGIT_REPO_URI} ]] ; then
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
 		git-r3_src_unpack
 	else
 		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
 	fi
 
 	cd "${WORKDIR}" || die
-	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-
 	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
 }
 
 src_prepare() {
+	local patchsetname
 	if ! use vanilla ; then
-		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		elog "Applying Gentoo Glibc Patchset ${patchsetname}"
 		eapply "${WORKDIR}"/patches
 		einfo "Done."
 	fi
@@ -750,10 +763,8 @@ src_prepare() {
 	cd "${WORKDIR}"
 	find . -name configure -exec touch {} +
 
-	# until the patchset is updated
-	rm -rf extra/locale || die
-
 	# move the external locale-gen to its old place
+	mkdir extra || die
 	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
 
 	eprefixify extra/locale/locale-gen
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 634137267bee..2f423be3378e 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,7 +5,7 @@ DIST ldb-2.0.8.tar.gz 1676902 BLAKE2B b86b24a597bd81ae11382311f3b60aeb8aca78ddbe
 DIST ldb-2.0.9.tar.gz 1676176 BLAKE2B 0d18a570ca61fcdf159b6398ecef74bc983c24ffd4d8f85bc9cfcbb182f787d0deb50c5f446684b851993146e03bdaf10d80c083a9534446b829714fff025b8f SHA512 f4d2480491f16aac7837fa2ff071e81e429bd9b3a365264723245791aad1831a236ffeff0f01f85becb998b224c321b166f3edd3f9a828714b7c3b24aed11a5e
 DIST ldb-2.1.1.tar.gz 1671390 BLAKE2B a715cb17a2d113560d37e3e5d29adfe7db43f89388bb5a474388e3f7a6ae277ddb0ee4d09d45eed18a87085c70d98308d195b3867cc57259767cb61a50c8cc6e SHA512 dd87da0746790895c617108c64b718ab6e6e630f1e3269154b40fc0e5623199a4b132d41623ae00d5c263ce79c4d6da34f072a140bee91a59dd6934969315fc8
 DIST ldb-2.1.2.tar.gz 1670997 BLAKE2B 0622d39029819b89119bce6a570c56b247871a92685d4ca33153a141d4cbbcb52a041a33c6ddbf6b01d5195feeb49fcf24f15a571cad99d031f347374860b3fe SHA512 6b9a7e6e3f6532ccedb087394b1d2d28f53a034353288bac1ea8d9ca65da5981191e31de6493445daa87684e08cc587886dd7fce19391bd20f1c7d440dbf3fbf
-EBUILD ldb-2.0.10.ebuild 2691 BLAKE2B 67a09af6418a6e17d2e2430c2648df7e88a4df33ad4637668b48cedac23c7b3d9ca8cf4d6fe09fa4bd97a2689f5cc2bcb3c99c31c786d75a19d79655320633df SHA512 f0be9e5e4640fe011609a1a00dea36685a4efdc52658ae2e60aac359e3e9b42334abdf9834351f085d1219513da9567d57a6673609b50f4a7ab629e51130cad9
+EBUILD ldb-2.0.10.ebuild 2690 BLAKE2B fa77b3191006f81cccc42c7054968a3e557163bb33f43824ca0484e58c7991ada0b845252a6758ba70a81bc74943608ba000b8b92f2ee05c2ce22d496039ba5f SHA512 f3a5f93057546d9ea17881da453bb1104a7ec4e11aad741ebdfea5b5c10205c84cc0c0fcfc98482c30d904d5025ed6c2873307fa4ae4fd71473f4ac0b6cd8d13
 EBUILD ldb-2.0.8.ebuild 2688 BLAKE2B ecc1ec7275796e6de5af9be875671301aa38da49e2345408d5f9054657ed4775d21cd1456a474217def897ccbd02e44be18a14cad14dd58ccaa816d8be968a9f SHA512 9c3320b50fdbb0e7912b731d6c6905de97b065c2c049ec046e35f09e296f0b1f350120062c3d1e3b29ada3e4fbff90e5d8576bc96397dc89c9536882d2a770bb
 EBUILD ldb-2.0.9.ebuild 2695 BLAKE2B 9ef1575d86dbe106a307851c63a8bbe84bc948a13c5837fb3a09caf996ed8e8f9b37ec76fcebc2faf423db3a0f7558464d150a1f64e142d94022a5607a1a1bf6 SHA512 fee1fd6ebdbd919332ae2b35506b9e69856761d340fd6ad117b27ce2f08c31a9eda4f4bb156a64e2f01ac35c95bec438a60d58fb696639376f32dde98ab02fc9
 EBUILD ldb-2.1.1.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
diff --git a/sys-libs/ldb/ldb-2.0.10.ebuild b/sys-libs/ldb/ldb-2.0.10.ebuild
index d96b7c18c00e..641f61f74f8d 100644
--- a/sys-libs/ldb/ldb-2.0.10.ebuild
+++ b/sys-libs/ldb/ldb-2.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index f962138b7720..88f655c410fb 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 365e142a194a..1c5a0c9b1f4c 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,5 +1,4 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c0289221aba0c640aa87734630f2fb44d65d0e1b6b087207cfafc45bec25e235f4f95662ca951f37df0724cece1b3276d3 SHA512 dfe3a14856f631c698baf6eb7894b07ebaff38886eb94aaadc0258b4a2f69e7034dbce4c4802ed0136d0967fd90cb6a1a4db473d1ed7fb373668dd2c93de8cd5
 AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3
 DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
 DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
diff --git a/sys-power/thermald/files/thermald-1.8-x86-fix.patch b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
deleted file mode 100644
index e944003b79b7..000000000000
--- a/sys-power/thermald/files/thermald-1.8-x86-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 26 Sep 2018 10:34:15 +0800
-Subject: [PATCH] Use correct format specifier for size_t
-
-%zu instead of %lu, otherwise on 32 bit:
-
-| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()':
-| ../git/src/thd_zone.cpp:106:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
-|   thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
-|                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|     trip_points.size());
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/thd_zone.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
-index b7edf9e..cb7b8e8 100644
---- a/src/thd_zone.cpp
-+++ b/src/thd_zone.cpp
-@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() {
- }
- 
- void cthd_zone::sort_and_update_poll_trip() {
--	thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
-+	thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n",
- 			trip_points.size());
- 	if (trip_points.size()) {
- 		unsigned int polling_trip = 0;
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index fb2c06fc7e5a..989a92d5fc4e 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 679a0965de6d..8c0e48832c9c 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,3 +1,3 @@
 EBUILD opencl-2.ebuild 1258 BLAKE2B 8719496fdf06af7e5049c5bbf78360fc7bf2b330ce82c49ac3561a0516aeffaa5de1c374335867a97c1efc3f144247abc6150461b2dcea6df01bf2c40fa68123 SHA512 9de56a00eeda95723e37b93cc5ae8b249748f22b72a5264438195887fa7f6b35561bba8bc5a5d0f8dfe99290aec19a1fd19294fef0d2ebfe5abbaad98edef9a4
-EBUILD opencl-3-r1.ebuild 1370 BLAKE2B e047fefb8aa436c4c413ecc367f0a985d303eb51bff1ea472a6303382c5bae09ac5573ff3ada1595a48423cd432080e9d0d7d39a3deb9fb0a3cb111bc0226f03 SHA512 9ff675f9829d1eb7e7deb184f66c24ce41ae87112713ef9436fb3cb3f23fba7fedbbda77041fa2af33c1377fc47fdd0ed1c8be8432c696c59110820a66ec2d34
+EBUILD opencl-3-r1.ebuild 1369 BLAKE2B 9805bc459b0a6972f93b0ad8be56cc36f376417bce7b1b7f455307094aae94bed37d230b5ae6f0e0e860ba25308382035b51a4f76f5d16f6ab26fb38d76739af SHA512 bd3260ba9dd9c5e2e8d4d4bfae91691c1155ce48398b0016c863f0c3ddd1b9f94d154ea8f1f8b299bb892566f98ed03a19c12b5e6af0c11e925d11f48f307f63
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opencl/opencl-3-r1.ebuild b/virtual/opencl/opencl-3-r1.ebuild
index f7caed35760a..8b108a5fbc65 100644
--- a/virtual/opencl/opencl-3-r1.ebuild
+++ b/virtual/opencl/opencl-3-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for OpenCL API"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 	dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 18c015d07b55..de17ecba178d 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 8d4fa5bf086c..182ad7153d9b 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,9 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
+DIST mod_h2-1.15.9.tar.gz 699712 BLAKE2B 035cc7ec8df4727abdd2cb90dfd4c0e6c94dac8a3872122bd3160a594207b7b948278662e8bbe538f736d4981cf6dde3207951f10b0525281f4547603323b604 SHA512 3743d530d2c70577142745046ddcee227b0a8c5e6d42c96d26df71c8c6234ffa20d36fd176c4e8e81a26835669409afb17df018139a7cfebb04748a84a467191
 DIST mod_http2-1.15.7.tar.gz 1042030 BLAKE2B 5252e15fbc71845db557d567daba63452df0693baad18f8b83f937adbd760f1fa931fbf663f1f5ec475760e75fc132fb0de63784e046092669b1d8fb44d96e9a SHA512 effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228
 DIST mod_http2-1.15.8.tar.gz 1029471 BLAKE2B 10dcbafeee8be71858f1eace6c65b31d4a06b9598ba0ed8dd0d191c6fa8eb0475e0b9bd9f52a09fdf3430b18c770f0cd41057e9661f252d11df0edab8189cb26 SHA512 47ee0ef6d5e6cdce8b5d35cdca107331378c3d3ccb6d7b6c36eea8e04dda3d5665233aa7834f122d2069d7c81a833bff08e3f0a279d4a5a0bd1ec6b366696fd3
 EBUILD mod_h2-1.15.7.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
 EBUILD mod_h2-1.15.8.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
-EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
+EBUILD mod_h2-1.15.9.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
+EBUILD mod_h2-9999.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.9.ebuild b/www-apache/mod_h2/mod_h2-1.15.9.ebuild
new file mode 100644
index 000000000000..b158648fdb59
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index 7a124f105c05..b158648fdb59 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,6 +27,8 @@ RDEPEND=">=net-libs/nghttp2-1.0
 	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${P}"
+
 need_apache2_4
 
 src_prepare() {
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1592571dd724..9d3e56b26675 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 4a8987cdb7e4..c59dbca9c234 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_68.0.3618.45_amd64.deb 67623460 BLAKE2B 612c243fee60df644aacb93d3a4a0dc3638fb3b3d60e746d9b09780e4262768c31485113adb7c4687abea3fae2f3d701c051a2f6843c6dc756cf60fe633e4326 SHA512 9694aa000215e8b093ce02c4c420ebfe371977f6a58fb618a6ca0ae9e6b686ab2a5a4ad9ec5949d8a8ebdecca7d3d7a46feff88f4e0f7dfbc1aff8126862a957
-DIST opera-beta_68.0.3618.55_amd64.deb 67671084 BLAKE2B bbde66def33b8853c6944f938856cf5d12198a4f51dda03d02a49c77660575bf075ddaaa932947bbc2e8a6fecf2fc47abb7dc79a883ca70939b716997271db0a SHA512 bc2f54b0f8db7125e2dff3f546ca93b07a161350e5aafd4aef1064034a147fb71c3afb243e31754bb97f5f61db45e10c3d4b5aab251128b0c61f53e7c7a6b92e
-EBUILD opera-beta-68.0.3618.45.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-68.0.3618.55.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
+DIST opera-beta_69.0.3686.2_amd64.deb 66496568 BLAKE2B a1060d801f64a7c5e7ea3877c8ea9f657ec7d10eb51836cf0efa3b80f54b59318e339d02d8a6860ad958e30e8605552bbc7c8a90cef87220798503b45b7b8df7 SHA512 bd5fb5f6d764b08d9e31bb41a507a4b694b5cd59b39d7eeb089b2757dcf003d80babba879d3b9a35a4ba92ec225f4a145fae554bb0ee141fd8990ddc79ada4e6
+EBUILD opera-beta-69.0.3686.2.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-68.0.3618.55.ebuild b/www-client/opera-beta/opera-beta-68.0.3618.55.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-68.0.3618.55.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-68.0.3618.45.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.2.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-68.0.3618.45.ebuild
rename to www-client/opera-beta/opera-beta-69.0.3686.2.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 3b9ddce5ce0f..28be65a45531 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,7 +1,3 @@
-DIST opera-developer_69.0.3673.0_amd64.deb 66207648 BLAKE2B fe503663dea992541d6cde133fe65fb8f61cd32fcc48547853a1f6e75df8f3faf5f5891cb042edb979d44f83a3ae149fb725ea30e567f512960ce687cacc40c3 SHA512 1036d76f45aaa0c537bd1bba5a321d5615a52893a0dd166b2614251dd8aac76b6affaa25a4893ea8918b5f5bc413d7ea509135009f9cff752962921955a97972
-DIST opera-developer_69.0.3679.0_amd64.deb 66192500 BLAKE2B f2ae419db95782ce47df7952747356d00ce714c4413310b2bd354865ee397201094acbbc0122545c4c71458456f25259488c17cd76d66b1f699b3df84c4d6c31 SHA512 a1036c295fc08167646bd0d8cdbb3ddecaa58137555b12c210c0543b0865be9f6aee9997bcdf379b20c8f7ddbb90f8f3bad540020a6effbf909a65632364555a
 DIST opera-developer_69.0.3686.0_amd64.deb 66217212 BLAKE2B 0a7e6ecb6698ac937a5da125e333a8e5ff24fd468e9e01132571ae541eabe81667f0c4fdad2363c4e5ebedf39d4ed89facf967d69ac8fd751ad083d466ea16eb SHA512 517f54e625224db9aed844b30ca2c56af82885e2fd6d8dad0cda2e3242d909dfea0a11d52afff4f42cf8b1f1465d9edf9720ccc37d46055eb4d060e16462a9fa
-EBUILD opera-developer-69.0.3673.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
-EBUILD opera-developer-69.0.3679.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 EBUILD opera-developer-69.0.3686.0.ebuild 2293 BLAKE2B 77ad4a915cb5ad00c8562e3383a8535382dfa64b2016e4412ccef9a2411212ae4d62dcddd795f9e017c92bbfdc36a3f8ddb3d6f43b60212741db3bf93602a486 SHA512 53e3ae62ce96adac8354a8a84fa00be95ffc4363f13e6e77b2cd7b86da1342b6f629563a4c7477daeaa711cefc52711ccb9f219b5da6cf107135ce2f219ee07e
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-69.0.3673.0.ebuild b/www-client/opera-developer/opera-developer-69.0.3673.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-69.0.3673.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-69.0.3679.0.ebuild b/www-client/opera-developer/opera-developer-69.0.3679.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-69.0.3679.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 06d8c742b53a..cf13ee4b91e6 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,5 +1,3 @@
 DIST opera-stable_68.0.3618.104_amd64.deb 67438144 BLAKE2B 496a9c0c07d330878868ec4b4a3a69da6f90b6d019c867e36562182d1c1dc946d827614797d4e66bddc981809ae925bf1fe8f1f5871099d08d500ae9a1e666dc SHA512 32d5bcf6619bafc5bf92a898dd0d86d53c94e9f7e6fd265d82a989407fe1cb926d56af720c1ca11cbe7701000f8d61c1df076e865d1e241ad20839606ffe3430
-DIST opera-stable_68.0.3618.63_amd64.deb 67426060 BLAKE2B f3c5bfc37829471a7feb738be8a3f412d774e6dbc3233e0214303e2a11e43705e9eaf838d2be4daa83b9b377d37db87d03262d9243d60e9702ad43e77a63087e SHA512 69781ad3aebb236a077b38558d1e253e237edc45fc232c56ff577370ad20ba2a2b212068f273b67dd6df21b3e7655c62101879f4fc7389f5b5db1f8237ee8bf2
-EBUILD opera-68.0.3618.104.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
-EBUILD opera-68.0.3618.63-r1.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
+EBUILD opera-68.0.3618.104.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-68.0.3618.104.ebuild b/www-client/opera/opera-68.0.3618.104.ebuild
index 58c0be89c0ab..fb69b98489da 100644
--- a/www-client/opera/opera-68.0.3618.104.ebuild
+++ b/www-client/opera/opera-68.0.3618.104.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/www-client/opera/opera-68.0.3618.63-r1.ebuild b/www-client/opera/opera-68.0.3618.63-r1.ebuild
deleted file mode 100644
index fb69b98489da..000000000000
--- a/www-client/opera/opera-68.0.3618.63-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}"/localization > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 1bf7eb3261d7..bd58b8e86fbf 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 95520644a7fa..01c752351014 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -5,5 +5,5 @@ DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddb
 DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d
 EBUILD awstats-7.4.ebuild 3369 BLAKE2B 6866cf202650d148525c9baccf5a0a5249dfdc51bb235f4bb44f9cb67d133be9a385b61fa43d4e3a6dbfd72fd9b94414b59e5514324acff109411ff28ddeba42 SHA512 7d732c580d6facadef850bc82ca5eaa70b44bbfcfba2b9717d325d81a154f44af15a0dc2c850d1d08807d854eae4fa14da2e163271a67d2d3d6da32de2f66b2f
 EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d
-EBUILD awstats-7.8.ebuild 2976 BLAKE2B 29f94b688fba371e91cff84b95e50821b8fcb8d9f8b59bb00a9bb8ef720db5a698a12762ca6200caf5de26141e5a2f1052c899a3085028f34ac85464b19e5089 SHA512 cb1a8c3d0136a3e939fcf7ef6bdea0f791b135d8075fb3df82a72dfb540f4846a101b508915ac46b6534173ab208616538172a8e3b05f147aac8243c0453202e
+EBUILD awstats-7.8.ebuild 2975 BLAKE2B 3aea1489f4d6565de27edb6916939a375ae90e0d53abf25266783ad6772054c02ed928b658529f00f3595531b6b2aba16fb416d4539885fd56f68dd1f56e73b9 SHA512 c9c14bb3ca79b963c15732169b1cb83b6cb6632eb9649e6571c5bf0dfeadf838c1482cf38f72e3ff80bcdb0a4ee08dc9a8b90192c5ecced08d8a0ede0354a00a
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.8.ebuild b/www-misc/awstats/awstats-7.8.ebuild
index 4946a4565b30..c73348d6087b 100644
--- a/www-misc/awstats/awstats-7.8.ebuild
+++ b/www-misc/awstats/awstats-7.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.awstats.org/"
 SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 781310c4fd53..70dc262db88b 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cf30989c8e96..db7da41c4b40 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,7 +6,6 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
-DIST apache-tomcat-8.5.53-src.tar.gz 5676477 BLAKE2B 284ddc3b3d491a57aac31fc59a9c7d80bdb11efb410ab53eea5d3a0a754507203de287eff0a621d02bfea581b45b860598c8ab95d529ad18790fe381f5518cca SHA512 d78613042a9e4caa5b5eeebd2589383ef10312698e535e2c8f82e40c7b3d793ea6cac50f346316a84f4b47ad330f82c7a4f0e4a3d2f0d449f1d4dad9c6d5e267
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
@@ -14,7 +13,6 @@ DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce82
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
 EBUILD tomcat-7.0.103.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
-EBUILD tomcat-8.5.53.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
 EBUILD tomcat-8.5.54.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
 EBUILD tomcat-8.5.55.ebuild 4557 BLAKE2B f51f8359dd552c5ea5c0816062c91c29d68ffaaff765241f17cd037187ca8fd03c9c39f7c05a95a51a57d24bfe2445ef50434f3614c9b1c9e8c01ce6a42287cd SHA512 910c1f7cf60c79dc4f7546e7d153bb239f44cd5eac7021bd78d49205f8199d3d30cca8bcc21df171fa0663d88ae504e6f237184787d923a335bf64f6e2d0b4ae
 EBUILD tomcat-9.0.34.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
diff --git a/www-servers/tomcat/tomcat-8.5.53.ebuild b/www-servers/tomcat/tomcat-8.5.53.ebuild
deleted file mode 100644
index 688cb7615768..000000000000
--- a/www-servers/tomcat/tomcat-8.5.53.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index c58fe81020f6..b23c8328f0d7 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -5,5 +5,5 @@ DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed6
 EBUILD tornado-4.5.3.ebuild 1272 BLAKE2B 803fffb9d8b1568ad02836612c73aa1b9d4c8ab409aba395d6a7a44adb786f03145936328b650536c88564f66a5dbf337b587a30e03d092753fbc104d2dcab3c SHA512 089dacaeeb8fe14380d3afcf5a9ba91b580d9bd67559433f3143e5b73a7ad879367a199862e81494df279a38b4bb631718dbc8bf22dfbda65734bf8b5481c7e4
 EBUILD tornado-5.1-r1.ebuild 1287 BLAKE2B 6ebf14bd2fbb026f6676b884745620f30090b5419602927c69130b2e521a3eec9ecf02784c27e9808fb616b4b795a0d364d2874caf647344d25705f874a4554c SHA512 466e8f0ccdb601067b44dd294e50340e9887b5fa2631057f66ef43dc69f10adea870587f538905f0987208e33e82c71bbf31811e34490204d730b1aad0efb2fc
 EBUILD tornado-6.0.3.ebuild 1249 BLAKE2B bfeb399ddfa718b8ea27cd79ec32b5c786c18f89931f71ee789d096b62716879d989bfa48cdbbaab27648d5e2edd690260dd17d163d2bb59476b1463adab2521 SHA512 0c2d9e879252d47238178deee370d48572349e8191364e8a873895f69a63795e4118f905520be57a8550bcb9b19551caabe3d9637d6f9d433dbf1167d405925b
-EBUILD tornado-6.0.4.ebuild 1096 BLAKE2B 913a10934e5e8211fba21b7bef98191524247f2bc1634ab32ec55887b6bf4c6dd85911834206a733bfa0b6d0248a775da794d80bced3b9923df7a02d7f6af861 SHA512 58b40673a0981b02f47be1ec34d9c1b6db56d031fc9664d36599c9eb65bba7842b7ab22c7a80a13f90c7df7d59008f57eee0bb99726e728b2efafe7bd822b7d1
+EBUILD tornado-6.0.4.ebuild 1095 BLAKE2B d1d79303c2a82bdf456f575b3298708bfee5384abbd89dd2ac28fadf5c829bbc268b2d74f74034df02499da1ef8765a929bdf90bd3d7ee3a0d48a595dbf8a0c0 SHA512 310465f7dcf5ee318305a9192dc436d95debe4fb4c35931e3f5e5f60ffb84a8718ce61b68c04a2e8acfb677f1ffdc102a760608ea0cc5a2675c0f975fe4e8b8a
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index 25b059bbdc67..002e85d1fac7 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 8d9edd13ce2c..a8dd80c469a7 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 14edb386b986..b44c8ca23b59 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-EBUILD xcb-proto-1.13.ebuild 1567 BLAKE2B aa0105ebdcba0b3d56e1688bd5ab00e8e2761897c21ef3ac1c541994cbdf9dfe65abed53129c5418d1d2178865d7d7a0499077a442b52bbb9f1e0a1ed27c1868 SHA512 d1cc2521b7c24ec2cd37f08166f25e910a1608e8e1e0ecda5583879b446f5862ef45f5d63b0663021e1b2d684ebb99bd6cffbdd787bc88cd6f05d7030b0a6a56
 EBUILD xcb-proto-1.14-r1.ebuild 1292 BLAKE2B 28a2bb2656257f6348b5e780dc79751543e38acbf4e10d0c6723ad2c61f2026e78695cc59b7c6a2645dbea46d0900e5c5a9b115ccf8c9101d0e26c47a8c32fdc SHA512 c7ab6aa93485610b6e0424dc79022c8bfcf66e48d9e64236d10bab045658aeeec3837d00d321e10be7f9b6e5063582f41b66486a6b11bdc32e78a0825fc8295e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
deleted file mode 100644
index 6313d75278e2..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-XORG_MULTILIB=yes
-XORG_STATIC=no
-
-inherit python-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 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=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	python_setup
-	xorg-2_src_configure
-}
-
-multilib_src_configure() {
-	autotools-utils_src_configure
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_compile -C xcbgen \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
-
-src_install() {
-	xorg-2_src_install
-
-	# pkg-config file hardcodes python sitedir, bug 486512
-	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
-		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_install -C xcbgen \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b040743e8c1f..65152f4ad6eb 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 3c6ff0b47ae8..76fef7e1687d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,8 +1,10 @@
 DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
 DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
 DIST libva-2.7.0.tar.bz2 477326 BLAKE2B 4ec99cebe3be8de46a7663b36cf5cededc271dc3ce6f6a42a2e861043c3bc3a1cb93ea31c4a2b7a1e5d7789de128066728b7d910bf19eceab107fe3b12966126 SHA512 4922d7c0d706d160b6885a045ca585e822275f04e66142d963b0e8e3efcf2ada81edc1255d0eb334c46c51b994e35c080d8ced10bf29a153cabe5c6991de3a68
+DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-2.7.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
+EBUILD libva-2.7.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild
new file mode 100644
index 000000000000..016d79e6442e
--- /dev/null
+++ b/x11-libs/libva/libva-2.7.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit autotools git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
+else
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+"
+
+REQUIRED_USE="|| ( drm wayland X )
+	opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index cd529c9c3c82..18f9df54d123 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,3 @@
-DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.13.1.ebuild 1456 BLAKE2B 926fe40639249315fc0c91c019ca8369f2aa5ddd87e5ac23818f17e76054c0c672af94298fb78307544f305712080a33180727b5437e7042c60eba5dae5a6ad1 SHA512 f2932a09d32d3685e447c5813f532a53b905b9c4b360ae814b2b285eac19290a936b61c79d2ff476ee997ac2b1fda9c3733534802c3a1c57c2ededa98f6b9d0e
 EBUILD libxcb-1.14.ebuild 1257 BLAKE2B c67b646a5c4a19363af81afb341fe8e6a7c57e0df26b76d7da6f52507224f9a224c7f53516466b1547edf138edd990c6d3312834e824ba421ebb9e9735692541 SHA512 ee5293494dbc06b09a91e36544d75abcb0e1f5012801525a4df4e58940d9f3bb5121ba8b75489ffb2ed618b045cd3c4e845662d818ea847bc9c34c98246cec1b
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
deleted file mode 100644
index 7edd83f2255f..000000000000
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-RESTRICT="!test? ( test )"
-SLOT="0/1.12"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b5288fa6117b..25a4534935c1 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 02c6be74833e..532248b7e4bc 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -7,5 +7,5 @@ DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.9.1.ebuild 2121 BLAKE2B f70ec2b27f543ba1ea37bce20cfc88b3ea28f5a100d6b72713112dbcf2b1d9df6c032594c3c9131750c403254c3e544d3be2259e08c59c3cc1de7fc64acd9d17 SHA512 ccc1adf63d0d50ae81110f11b3f8a63386df7cc9c8ee59b2f70f19f2282d8138c7faccb5b68b92aa864790837e8e89e22363879eb97815113db5442e8c7a8ed6
-EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B 78030e4049e9212084e8e1915cb1714afdc4c95826c2510e22018e09e9a1df43df07f5040afd84e3d1537985a10f208b698ba2ed2ce41f06f803cdde5b2777fa SHA512 d8b2b8ac78a1ce8d16b80f34d0bf306252632513feb44ebe2c89b04297a8268508cdae0116607acc9b184c2a8d8521f42e1d9818f3a4b8714f8139aa26ee6542
+EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 2de99eaae20b..3a3b2d0bfac9 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit eutils flag-o-matic gnome2-utils cmake-utils
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy-core"
+HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
 SRC_URI="
 	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
 "
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index 68e7ed50b824..3f94f5cc5ec1 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,3 +1,3 @@
 DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 959 BLAKE2B 6154829c5750ef8e5ac4af7f856d6163beaf141837c2b6fdac6aa1c3aa5062732d14169a82f9cdbd179e53811a9cd782b0c87ec9f93e37327749daebfae579c7 SHA512 dce65ca80c31c5caad4e7e9765363100cd2491d86489fedb6667bf8102271f624d8ad5591b0e94d794720ec1cadde26ecdeb14a69c12bcca8486b61e7ea13c2e
+EBUILD vnc2swf-0.5.0-r1.ebuild 962 BLAKE2B 732900f2cf326d2db87a70fb505c34845eeb85b3dec3b61e5eb3dbbb43c135fcdb1c51a9434a377de9cb534c5a2b9f90e555f56595fbecc336149272da9c0df5 SHA512 4af7e15ef99e79e591a891dee41dd06dd7c7ea5cb6ee87255ac5aa7516f6caef08b2facfc9bc50f0339c0f672fc522640c8b0599ee772412d51987e6c9ab8d5e
 MISC metadata.xml 595 BLAKE2B e5cb40382a69ca1f5d8df0825ad2fe0b1df483f25f6f460694de69d3ecb52206436e0b283a6d647f58ceab872df857a50b106a2af52abe91b1ae343dea354463 SHA512 6704b8f85e5439e662e490d581adcfe3b822bfd75e78b91a4074e5cf23267b1e180b91d18cf098c5745587c4e31829d4469bbbee3741fc1535eefe6d737f9732
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 63abdeceb57c..07b8cc0bbeb5 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
-HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf"
-SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
+HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/"
+SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
index bbf95b1a0a43..97ffc7e2c1de 100644
--- a/x11-misc/xcalendar/Manifest
+++ b/x11-misc/xcalendar/Manifest
@@ -1,5 +1,5 @@
 AUX xcalendar-4.0-implicits.patch 381 BLAKE2B ea6ad6617227900cf7cfd67957109d28b5e820ae87c0796367808c2442865cc94dee718ac91550f392947b77a52bca1f952e9faac14178da4b0b90cf1ede6e63 SHA512 56c68560d2f2d75b5e7427e870189771f85994e934f7d813eaa89e34002d769b9aa1e24ab49a84a395d1535963802a249171e423e47c5d0e741e1a6e9a07fbc2
 AUX xcalendar-4.0-motif-gentoo.diff 1104 BLAKE2B 3176c538d92a776faef7fbaa02985964a64609eb5e3d79edd97d095309c2fec3e6cc0f621cadc97a09ed3e10fbeb35e627214c9f7ad758486125f1d61bef3fd1 SHA512 b6f15a68e2698a1d3f8dca2be8cc0751dae447268c6bca76aeccaa5a919dc31d3675fbb8d49d7d0d3293c50835b2628346f1ea5f7eb1da6152bb1ac73282ad59
 DIST xcalendar-4.0+i18n.tar.gz 48635 BLAKE2B 939880d749dc36973d69d6ed6f1d2c36dfeccea6d17a9ce77bde122af8c3a19bdf683b0c1838ba11a769ef4a8977a93cc1e67c40dacac4c87d2cb7a565e3ba60 SHA512 c9b3756bf857e4956360cb3efa1e185bdc09d6053e1b8db040822c73320589ef825330184fa3a8b949f94a89a6ef56438927886b3740922a4bca7dbab9285a4d
-EBUILD xcalendar-4.0-r2.ebuild 1260 BLAKE2B 5540df0555a476effd878ecad3bfe9a5e34f0af69b723ad2df858c6b93ea94537099664cf7428c60a1a639bd156a4368ac76bba953d11e785fcbbe3fcaac5ad0 SHA512 34a2074304b67ef232231bfb0f3b2792589ab67706286e840f0ac53ddb9f885dfd4458c3b2c385915faf84684990d7035ac533585491186e324c412f144f3281
+EBUILD xcalendar-4.0-r2.ebuild 1261 BLAKE2B c4a21bf2cd528d26134d591b51825d2f9894511e3933a38fea2566b81594ddb9320c7cf9127cbdaadb1dd3e173d3565caa773cacb0199c409f802fd55df0e11b SHA512 26a77861afdbf0dc03fd4ff4e593e044a0bbee77841df19e9b2c62216b42e7d41aeac7616eb57dd4450980c3025bfccf5fbcf0365d91b84d069df7e394bd383a
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 3478ecfa79e2..b89bdea80b70 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="A simple interactive calendar program with a notebook capability"
-HOMEPAGE="http://www.freebsd.org/"
+HOMEPAGE="https://www.freebsd.org/"
 SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz"
 
 LICENSE="HPND"
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
index 9ef1dac1ebbe..9de34a474f39 100644
--- a/x11-misc/xearth/Manifest
+++ b/x11-misc/xearth/Manifest
@@ -1,4 +1,4 @@
 AUX xearth-1.1-include.patch 231 BLAKE2B 803cdd036a1018ab85bd3acc30a6f6168a3596c04dd7de7196983b6c53b10e443d2ed043f61faa35b1ab87f28496f5865f128008b604efed41a74af3effc0d0e SHA512 9e4fd1d44eeda5c79ab22ceeb20fd005cab71869bcadd17adcb1cee10157c35145e7c7aa6d3c62f3da1be83cc79763b9ad77cfaddd4021dbcb56c8efcbccadb7
 DIST xearth-1.1.tar.gz 157887 BLAKE2B 2dfc43b1a8fadeb7d30a4234496f44171cd138975e84b295e60d0f9855c1f3b011340b2b3aecb98d75fde2a71fdddb4e959ba84e89204f246915b7cd1a76efc1 SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e
-EBUILD xearth-1.1-r1.ebuild 872 BLAKE2B 06ed8c47df0d7119b0687755f5329c48fbaf064e239fdb90e5395f60bda3c8957a79853c811413e57908fd5ee3731a210c03406033ed55839c1fa07b5dcc98c2 SHA512 03f140a2b0abaf2632f2ec2c26ecb100376e140f5fd4d74305a0006e95ff3770a1f64489d6ac8a1da6938ef747dbad1e9b35581724e79dd0217b3a48568a3470
+EBUILD xearth-1.1-r1.ebuild 873 BLAKE2B f3ed79afb2306ed7b166e00be122ceafb5a0affb325b78770dbec8e50a654a02f117a2c1064c15751bf1ab4e02b80d9c95b10440aaace158437d940d2c3af304 SHA512 c0f06f7772dfe7f7ffff190121b0bff693bfd286d7709ce4d4967445839af33f23488b0094cb46d5976a8b3ba52f3707f3922ac24443b43c4beb825d79ebe368
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index d46796f0ed79..52016d87ae19 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-HOMEPAGE="http://hewgill.com/xearth/original/"
+HOMEPAGE="https://hewgill.com/xearth/original/"
 DESCRIPTION="Xearth sets the X root window to an image of the Earth"
 SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz
 	ftp://ftp.cs.colorado.edu/users/tuna/${P}.tar.gz"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4f7eb56abdab..af684d5717da 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/gtk-engines-aurora/Manifest b/x11-themes/gtk-engines-aurora/Manifest
index 8a8b8568e35e..38c322cddb58 100644
--- a/x11-themes/gtk-engines-aurora/Manifest
+++ b/x11-themes/gtk-engines-aurora/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-engines-aurora-1.5.1-glib-2.31.patch 229 BLAKE2B 5cb08af273de69609a4c0a08f88381e3e2bc044cc7af72ba181deb9c4bb515d88f5b1e75cbb5bcd7f955adfc111a13b18b2e9b0bce2bdebc563c37a5848895a1 SHA512 e5620b76eb4c9423eb6412d23c2bfdefbcb5467f24cedc2e73299e4857c87ee84b57081d7996dc56c858f14bda2bfd7dbe004555f2d54273ab441b749611308b
 DIST 56438-aurora-1.5.1.tar.bz2 371792 BLAKE2B da4a06c5fc51e74e536a1f6ff9934b4312cd74f61a885b958139300a3e5f9e19a2b70fa6cbfd9317654b70cc73cf1b137a6c8e08c97656d1a815b746948f2dca SHA512 d8e2a2b071ff66597232f8dd681324cba9b649c9884b69b8135c83de23ff371baac0420968677ea1e28153953b7b5a0a26c2cfba20ef95179d9140e9a9faa67e
-EBUILD gtk-engines-aurora-1.5.1.ebuild 881 BLAKE2B 828552c56880427aa87387df7aaa3b1210a6e4e1af239a2d39e6b96a102e8caf2326355154d0f2b6f614b2891b3da54796f4a3554bf79a1091aa0142948b4bfe SHA512 0f063ae2cfc98d8d97bab6957fbb073923ad45f110990dc4e991f5862bbdc973a00441db7cf50b908a4904a05e8bb6116cb4c45338ba4ac4eb8c4d8ea5f577fb
+EBUILD gtk-engines-aurora-1.5.1.ebuild 883 BLAKE2B 92f0b387a88474a63d1597c141886bc32bbf5a28d349a9725104aa142c2317b2fdf939aff595f88e6850d4a670b521551457bec01706bfd9de09e4bd3aed994a SHA512 dee1b1cc6337e01953220bc6680d7f75f217c0dc116269ec3394d6b32091d7c38c2ba14b85f01d2d405b5319d5401df6dae573e31be418074ab86772673255b1
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
index f85ed5696b88..ec067e806173 100644
--- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 MY_MAJ=$(ver_cut 1-2)
 
 DESCRIPTION="Aurora GTK+ 2.x Theme Engine"
-HOMEPAGE="http://www.gnome-look.org/content/show.php?content=56438"
-SRC_URI="http://gnome-look.org/CONTENT/content-files/56438-aurora-${PV}.tar.bz2"
+HOMEPAGE="https://www.gnome-look.org/content/show.php?content=56438"
+SRC_URI="https://gnome-look.org/CONTENT/content-files/56438-aurora-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-themes/gtk-engines-ubuntulooks/Manifest b/x11-themes/gtk-engines-ubuntulooks/Manifest
index 98e74192a254..c98bd2bd3633 100644
--- a/x11-themes/gtk-engines-ubuntulooks/Manifest
+++ b/x11-themes/gtk-engines-ubuntulooks/Manifest
@@ -1,5 +1,5 @@
 AUX gtk-engines-ubuntulooks-0.9.12-glib-2.31.patch 243 BLAKE2B fc3ea8ac12cd0a8459c30bb6cd43b245c41312d66ae75a6d93b19e1cafa1afcb541820dcb8e0c80c72bc5dc25bbaa7fbc48f88df3ef5e38115bd3909c7f39c7c SHA512 fc458ca7cc1c3976a0f780a0b30c5ba5eac9fbed055715def72c93adbf39919ea368648b8dfdb250c70370b0d4086c483c92cb18342bb82f5c66a5fe1f92b92c
 DIST ubuntulooks_0.9.12-12.diff.gz 8398 BLAKE2B 31c3c40bfaa3430f400a672328a531101c7e67c3088574f5325295d8fb2d0006a254bff7ab392710cce65393bb3681e7793b4b39f059fc0f7c59b3cd7cba894d SHA512 8e4d751e9a7769e88d4c8a84fac049ff2845bdc83b575668da984f527977f36445a0f2dad317ee1d6668105c156bd69f298ab84bd8f86dc7afe65921e434959d
 DIST ubuntulooks_0.9.12.orig.tar.gz 345833 BLAKE2B cfc0f2ee01b9f87129e987c36d89c32b4dfba26c9fcacde3da06608d47f5e42449df2e2ef982d4d7c4306059b0eb9f0eb1eee3d5f4b1a1a1a4e3896d030efe23 SHA512 5d34abb316f86453b1c26c5b666c752ad7f71d517163da7fe5db19db9e15f130eeaf6f0412b695cf49f7701ddb61614022fbdb5a1d3f9c229e557bc24f15d379
-EBUILD gtk-engines-ubuntulooks-0.9.12-r3.ebuild 1302 BLAKE2B 5c91e3eabb6a109f900f23146d0197b5bb5aafb775e7f213cd764305e83b3286eb122ee67ff55162701336526ca1208190885dedd053646ecd7cd32b517e5160 SHA512 da328212f1f69373f86eb8fde60d06135bb0bf2b84bb5a1d0c0e560a187e47850892021726e14357a36e0e35661abb652a0eddd4b14dcaffb73761f4d5ac7c0a
+EBUILD gtk-engines-ubuntulooks-0.9.12-r3.ebuild 1303 BLAKE2B 6557dde3d919cc5cbfb3668e7ff8c9250ca2c8cd8dd976f550a02d8bb68413da7750dbcaf37fb480a13a976b2a974adc023cb2d80eb2aeb46b9ad98380f6f7ba SHA512 82227b0727a2619809597a133e112b5ef07dd51b1f3cd713124f086e514a93a384fc001d270971e7b0f6620ea15a6ad35748a46246885b5612ecbcaa4b1ee74d
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
index 7ac97c44e10f..ac3d3176ecdd 100644
--- a/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
+++ b/x11-themes/gtk-engines-ubuntulooks/gtk-engines-ubuntulooks-0.9.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ PATCH_LEVEL=12
 MY_PN=${PN/gtk-engines-}
 
 DESCRIPTION="A derivative of the standard Clearlooks GTK+ 2.x engine with more orange feel"
-HOMEPAGE="http://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks"
+HOMEPAGE="https://packages.ubuntu.com/search?keywords=gtk2-engines-ubuntulooks"
 SRC_URI="
 	mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
 	mirror://ubuntu/pool/main/u/${MY_PN}/${MY_PN}_${PV}-${PATCH_LEVEL}.diff.gz"
diff --git a/x11-themes/human-icon-theme/Manifest b/x11-themes/human-icon-theme/Manifest
index 3bd574ffa77a..168abdd8d0fe 100644
--- a/x11-themes/human-icon-theme/Manifest
+++ b/x11-themes/human-icon-theme/Manifest
@@ -1,5 +1,5 @@
 AUX human-icon-theme-0.36-fix-buildsystem.patch 595 BLAKE2B 4d2c848a68c823f26a52f73effea0dd1b941bb92422089d80145ec3bd26c4625f95a526cc4fd5900f25dcee887ff55126980fb82fe01a8587c8e7e0ec2968c50 SHA512 81fdbc2f3fc0852629d77dc09934a76adeef41fcc31d74cf50d565e19410060024aba33cf4adc6be33c5584a055747a9d3ebbcf8c59dfdc2c9c5bc837ae7b2db
 DIST gentoo-logo.svg 13764 BLAKE2B 8b6339945e24f8017d75030b6cbbd767be0955fa5b7783e33e223e631b48f442e57428caad2f2554a157bc2a2f63da159bc8f443c3d2eb87c16cd2e3262221a4 SHA512 c89df6fad432dfbbed921c4828ff22b9ea5b8930f403ad23e867a11d98764488dddc453b6f26503f9f6dc25b8c5a387b7cc91c17a6b5cee15c4aadafe76409c1
 DIST human-icon-theme_0.36.tar.gz 980140 BLAKE2B 21f33b1b9e70ef908c495dbd3e72edbae00cddb4088fcfa8fde53a5f469ee13c6051c61bb87d95fa98605df5bb7114d095b09512c2d3a965c2c8234dacb1c07e SHA512 cb4ae3de6f721a9f06fd57867e97b537bbaad9bb268f100ae611e9d2c483267cd931f084469cd66000fd6bb5192b935e1e655a92b8fc0e9b537b02ee948a96aa
-EBUILD human-icon-theme-0.36.ebuild 1007 BLAKE2B 3c17300f0649a5accd6b4b3e74add07c6294d95af73eff28e1e936e612bc065d993bfbdccd718bb560f30ee496047de7b635b2f04053b498d2923a6834313922 SHA512 b008e639f5948148fe56c828a46ac648095ece555c86140b30edaf195242f0ae30b8b825e0ee2c303d7d260f928c942ec1d53e5b2daa743ed81b7e5990c260fe
+EBUILD human-icon-theme-0.36.ebuild 1008 BLAKE2B ff6f44f628dacfa1ae9bd8e70716e4d283f346d06a059508818c9036d5aefe94fefe80c6c72a6b8b99aa25e347c934a51960f79398dda051a1c10814966cee6c SHA512 bd578b1c059e91300b7486f693a50f21d3713fd9d99114bdd09794111f1487996c820e5609ef42b4b2b2447e3854b4a60d4217ca693851ff45bc4222343f726f
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild b/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild
index cde168627e62..e3ee1bb80910 100644
--- a/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild
+++ b/x11-themes/human-icon-theme/human-icon-theme-0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xdg
 
 DESCRIPTION="A nice and well polished icon theme"
-HOMEPAGE="http://packages.ubuntu.com/lucid/human-icon-theme"
+HOMEPAGE="https://packages.ubuntu.com/lucid/human-icon-theme"
 SRC_URI="
 	mirror://ubuntu/pool/universe/h/${PN}/${PN}_${PV}.tar.gz
 	https://www.gentoo.org/images/gentoo-logo.svg"
diff --git a/x11-themes/tangerine-icon-theme/Manifest b/x11-themes/tangerine-icon-theme/Manifest
index 9b2b0b565ec1..cb2dd7118b2a 100644
--- a/x11-themes/tangerine-icon-theme/Manifest
+++ b/x11-themes/tangerine-icon-theme/Manifest
@@ -1,5 +1,5 @@
 AUX tangerine-icon-theme-0.27-libexec.patch 331 BLAKE2B b5e62d4c113488cb0c79ef211428b7f7dc63b64eb066bb5f81d1139bbb7ca4bfbae793c88a92ee119c0afcdab7cd25b344c719b22441dab6dabffbced7bddd94 SHA512 49b716bd3271e29126f28276aaffff2b41f85384518a2f961ea6eb5ed7b3beefb37ec2627b586b518624c3bf29d65a4351dcd0f4f65ec089cbc570e7c5188bf3
 DIST gentoo-logo.svg 13764 BLAKE2B 8b6339945e24f8017d75030b6cbbd767be0955fa5b7783e33e223e631b48f442e57428caad2f2554a157bc2a2f63da159bc8f443c3d2eb87c16cd2e3262221a4 SHA512 c89df6fad432dfbbed921c4828ff22b9ea5b8930f403ad23e867a11d98764488dddc453b6f26503f9f6dc25b8c5a387b7cc91c17a6b5cee15c4aadafe76409c1
 DIST tangerine-icon-theme_0.27.tar.gz 1163543 BLAKE2B 6c6ad3e257654f341a66b9e7dd5d4bd5e60a061d6fcea092a302e1aa7ae0c0a6c123537a7f6c8609f2c44c2c0b6480169e63e31f577ec8c9360840256145d1f4 SHA512 e9efc3a7b215e07089d9c326c5f46bdcc6f53161c1340def5244affc5c5dbe462d532ceeae2b02d3d2a698d600700371e7016bd76efb5d40bbaa73ec447616ef
-EBUILD tangerine-icon-theme-0.27.ebuild 1103 BLAKE2B 4da09211c927a8f019ab1a0f5ed05ba88795191f98102683c918cce0b9234b70c4e563da6aa2e8f56506af7e9184e5af97ef5965f65f77ad1e644ef5cde850db SHA512 6d4d1fdd141c5d1e2e8dcd5395b64c311a937244e42a2bc3f86d0743bb697542ea7e10ed5e37d0958fe28343d6293a06f129da88ebccbac80bbca85a16203999
+EBUILD tangerine-icon-theme-0.27.ebuild 1104 BLAKE2B 63c4f00e8d6687ff72b148fdb128c411222dee9fd7ce348af00a33dcee78fcd7fa988ece67aa3da43f87b161f89dd6ada0a7e9a16db9435def70a564ba0017fa SHA512 73f73952579a9db02b5e632ca2bb97732ee31975a9189fc3ed7450132752109200c7c39a6081c62d42c55b23d1e884261a6c96a876785ddab69661986db6da35
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
index 365c0df59781..cc5bef710d1d 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xdg
 
 DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
-HOMEPAGE="http://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme"
+HOMEPAGE="https://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme"
 SRC_URI="
 	mirror://ubuntu/pool/universe/t/${PN}/${PN}_${PV}.tar.gz
 	https://www.gentoo.org/images/gentoo-logo.svg"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ddeeab2cb01c..883347954c4b 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index d6e51176080c..45a1e612f5bb 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,8 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
+AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0-r1.ebuild 1979 BLAKE2B 2863b90066e24ffdd94413b06988418fed6a645453c948ec584ca49707f176461cfc0debacc2c52b93dce69ca89380a0ed301c5ac707a963597bcefc74453db5 SHA512 daade87efb6433bdac2ca3bc87c6a6418fc812ae07717a64fea97f6e88fdc58b8c29a4229e3a8708c4207b63d308242f47f1dac39757b15711358fd179fdb6f6
+DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
+EBUILD sawfish-1.12.0-r1.ebuild 2032 BLAKE2B 6aefde862da34a34dc1f4c570385e65a223d1b5538322877313dc9bb177939f485afb4ff7c70605976bdc351c042830c82e32e39e18d208893819c16aaaf7f39 SHA512 5a85929922b63fec43b0c89ea512063b743a178048b6c84efbe829444683ee6e0d8978d0b35cd6cc25ef2ea7f2602b5d5c0067521d58e740f5dd775dccd58865
+EBUILD sawfish-1.12.90.ebuild 2212 BLAKE2B 84693e0db216ccf54a672c06541e5b7ec18debd313fd9bb6549642c7c25206f69828f652890dc9fc9b496785cbe1a7642b51b3003286d992e0b60a2e55a0ae08 SHA512 b8cec5c9ed88049b4d1fb2889bb873053320a462771895aec0c107a1ff7cca726eca67c1caabd11ba740d32a3dfbc4aa02c04d8b4f322737c2e102e748f72f37
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch b/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch
new file mode 100644
index 000000000000..73f58be99eea
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.12.0-fno-common.patch
@@ -0,0 +1,39 @@
+--- a/src/functions.c
++++ b/src/functions.c
+@@ -65,7 +65,7 @@
+ # endif
+ #endif
+ 
+-DEFSYM(root, "root");
++extern DEFSYM(root, "root");
+ DEFSYM(after_restacking_hook, "after-restacking-hook");
+ DEFSYM(position, "position");
+ DEFSYM(spacing, "spacing");
+--- a/src/flippers.c
++++ b/src/flippers.c
+@@ -22,10 +22,10 @@
+ 
+ static Window edge_left, edge_right, edge_top, edge_bottom;
+ 
+-DEFSYM(left, "left");
+-DEFSYM(right, "right");
+-DEFSYM(top, "top");
+-DEFSYM(bottom, "bottom");
++extern DEFSYM(left, "left");
++extern DEFSYM(right, "right");
++extern DEFSYM(top, "top");
++extern DEFSYM(bottom, "bottom");
+ DEFSYM(enter_flipper_hook, "enter-flipper-hook");
+ DEFSYM(leave_flipper_hook, "leave-flipper-hook");
+ 
+--- a/src/windows.c
++++ b/src/windows.c
+@@ -75,7 +75,7 @@
+ DEFSYM(north, "north");
+ DEFSYM(north_east, "north-east");
+ DEFSYM(west, "west");
+-DEFSYM(center, "center");
++extern DEFSYM(center, "center");
+ DEFSYM(east, "east");
+ DEFSYM(south_west, "south-west");
+ DEFSYM(south, "south");
diff --git a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
index 2cc5b3ad24c2..726c0ecafee0 100644
--- a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
@@ -34,7 +34,8 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# From Fedora
-	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-fno-common.patch
 )
 
 DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO )
diff --git a/x11-wm/sawfish/sawfish-1.12.90.ebuild b/x11-wm/sawfish/sawfish-1.12.90.ebuild
new file mode 100644
index 000000000000..62df528557df
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.12.90.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/-/_}"
+inherit autotools elisp-common eutils xdg-utils
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"
+SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs kde nls xinerama"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	>=dev-libs/librep-0.92.1
+	>=x11-libs/rep-gtk-0.90.7
+	x11-libs/gdk-pixbuf:2[X]
+	>=x11-libs/gtk+-2.24.0:2
+	x11-libs/libXtst
+	kde? ( kde-frameworks/kdelibs4support )
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
+	"${FILESDIR}"/${PN}-1.12.0-fno-common.patch
+)
+DOCS=(
+	AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS
+	doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	set -- \
+		$(use_with kde kde5session) \
+		$(use_with xinerama) \
+		--with-gdk-pixbuf \
+		--without-kde4session \
+		--disable-static
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas=""
+		# as "install everything". Don't use --disable-linguas, because
+		# that means --enable-linguas="no", which means "install
+		# Norwegian translations".
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas=""
+	fi
+
+	econf "$@"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile sawfish.el
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
+
+	if use emacs; then
+		elisp-install ${PN} sawfish.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_icon_cache_update
+}