diff --git a/Manifest b/Manifest
index 95cbe0103b88..fd33b7ceb7be 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29314 BLAKE2B 71d1a39f60d87e45670cfba5099650209b973f785a37c67ae7f315b2c80d43024fd48e7e63fed65771b7e706428e35c47bd9829e5600b97eb8ecd583461c826e SHA512 bc567c5066ef961227a263a0c9d256ee36f0d863656aa6fa384948067943c186f961f5565a5f28e8fd98dd83576b89530612aae79538c84e2feb9b22c6738a74
-TIMESTAMP 2021-02-08T11:08:40Z
+MANIFEST Manifest.files.gz 29279 BLAKE2B f9f6688999c0168333af064ce2aa17dac20bd43a3df4ecb5abd162cbb8f31783be32f90183864e22d74c8b3f7d986b8f9d63fa74ec7800b17bcff2f0605dc995 SHA512 c4593964e7e533ceb55b23685af7fa78a0a31d0dc722a326a785b65ce48c7625c7a8f05f3a668a94b84097654b7344489300cd8ac65b475ff04a979c3c179322
+TIMESTAMP 2021-02-08T19:38:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhG7hfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhkztfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDzhw//feCH9oRpA0vVJ7SPwWEK/kEpz5snpTWe4mnS7YreXHyBFRmN6RiTz/nX
-SKQknzRhEaPhMq7HLMDxn4Ec0fA6DT60t4ZmABrXfhzKw8OrflBfsljjc2Tze7RG
-JVbCH3C5v08djl2QGILGmL2uD+Ngh+c7uTxmoIvpJNulQCx83SHdXTa/cw7GB++D
-c8GDOuIGQbLDaCaBNgOEjkkPugs/AcakFrDYRBUShMLXkXqBkOCiB4Dy2YEo6xVY
-qz2n56ibTyUa4mSEAQ+wLSLhFrSQEX9O+mFpS074V9oFOfTXqbiFcRsuy4rC75SX
-xBATBUKG4e9bPl12+nZX2bTgHg4pLonJO+2UE0ceF8cidRhFsGxjoT1QeAV0H9EV
-X+VHq/yNI3W2U/ZfhHLK7W4Mu/NOlf8VODDwPomsGkmq487H3nXtg6Glb1ekAVId
-COSLBCfOoab9AJghAWaty3Vv0FAv3+wtekSyn0zNhLZ+plgHx3Kh8diA+r1ORm4h
-mZT0fdo6cNiaELK4DaVv8uisDKh7ilXC1jgCHuoa34mSz+UVQCu/O7yvnwEAdoeK
-r17h9JphXUHtdJx5SS06OktgbvQHO2eThHiP4m+ILk6a6jmSKCfjhdM414RJ28Jy
-cMN9xEdFbpgzwGR3UzFZtapUlsi9dXBCb+DNJd9fyycvbGQ0b/g=
-=+eGZ
+klBtlw/+NE7qKN46d7t3wbNt71DzkhikmuG4DnadaH41cEyLNblA5XHe8JOpzB4d
+AJIsdYsz/8MsBs/xVjJoz52qJHKFZvgVRjplJH/TayC5tudcQRpN78XXVFMQI8Ga
+e1srepJz1JXFXHk1LZO2irHsCuAWIo5crivp0h5UAamHgfLjJxYesKfNQ8Y99i6P
+Us3UjSK5+eWvTydOlRMIfvgsoo3K7Q1gwDMj/QSAWO7dL2g9JYlTFdRrbDjdPgHl
+boJ7YqMo/xCkJmK2oFaC01Spkv1LvKpt/WmGMErHhS8zzk3VyIQXwy5j2ntnq6o3
+WTRnm9SAz8UFUKDUHYCktSKeyfPzwTGdk8AXFifg/jV3exyDWhsSlhC8WwGSZdkw
+FvYUgxRDZbfEoG6Ju69yVySKcKN4QWXugc6h0a52FZfY12mGJf3ZvxrSlmFEDb1R
+UmUWxtB2UJLweiD1dhGBtGwHHpCu+pwnL80PRCWqhz6OyZRfc12RL4qD28vJSXY2
+qOWD6npbT9aIYhabOnqI3Q2jg7jXLkCFC6AkwYXJC6OWfESN+6W7pRCYLdomfUUT
+Rc8ik06o8q4NfHYX5uoAn+rp2viOvFJF9zD726e6fzlluu66SjSsIhdQryN4Ny3a
+RFluGVfClEEN4CdmpUiaMb9w3lQrrtq3ZAgyX/Sf9AfcvX1u66U=
+=2n26
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c32fdb31c904..0919bb5d3052 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 5dd29f0caafb..e36386fc57b3 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index 7989d28927e9..54652096e721 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
 AUX lua.eselect-4 2864 BLAKE2B cb6a5333e4e0dead16a51e8eda7eff01fcbb5046d1cd463fef4666aae2c466798b8939d1b48fd5ce056d80489f255a1252dab1d97f69edc0e4140416e683cb9b SHA512 4fdd56d94954f87bf8b1d18cba67d571facfadbce05d99fcaa0b96a48ee9653a452f730f54ebdf1f7421cc23a731168b8064b5f81aca9b7e27cb536a62488ba7
-EBUILD eselect-lua-4-r1.ebuild 584 BLAKE2B 4c1ced55a171d4642cee01978ceca8940ab48b5a0801eb1d2f73758c29982923d56b5a4006378abd1eb7ea670ac43aa064cd00a2aa6605dd10e47c33fe0f3a9d SHA512 4d3fe2b853c34ec9c49c82d626e30ccf13b5c04e1aff1a16220c15d4e0def302b8a69642e1d6a29f61fd456dbc2481650814dad55fe7d03c96f32af4387bf96d
+EBUILD eselect-lua-4-r1.ebuild 583 BLAKE2B 6938bb31c0ee33f68d32a317101bc29e5f70f0dddea7a84800991b6a1c2758659c2c0197a4e8860e13fbd8a06cc643a334d38a5f70b022e811a1324a6260391f SHA512 94fe8f81e9abe324e112c32d59e6ee7ae12e0cf4456fcc271fb41b4498df79485c7b2a9e4eb90ee2b24d8e00a23ebf61bb54509c4780407fad2467b4ebe84d7e
 MISC metadata.xml 385 BLAKE2B a6edcc3e086d3cee150db65f0795b056cbb59200fc0494b2fd57ae6d02816688ce05c213deedff3dd54b4a8fc2ff9929fe01cc347f92999b255e9df44e1a625a SHA512 fd02e0ecc4094aa0b8d13a1ec6e5cc757b498feced31c13216071af062ea7d00c88837f1ec3af6bbba1b42e00cdf6154cad2f50cc20bde3301bd2fc0716bb11c
diff --git a/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
index 96af746df4cf..aa3b260ecf9a 100644
--- a/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f9d41c6577ea..0ea7ea261178 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index b56fd0c87ab7..dd69e9fb8d2e 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -6,6 +6,6 @@ AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f
 DIST collectd-5.11.0.tar.bz2 1851663 BLAKE2B b07c727ed553b3d11967da734a98fda753794be199377b08a2780b7d3f79acef345f160d930dda68cd12aa0949bbc0aee6ca5e7ae01e16a5e392a4a73e272d1d SHA512 87671545e3d01770c204ba4439265d1c0add6a105bf04ff02dc04db3731fd933d32ecb9b0dc15f2e504d70c3e421a64cf19728c897aa4fb1fda86e393ffc15bf
 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
 EBUILD collectd-5.11.0-r3.ebuild 20162 BLAKE2B e93fd56b8a4b1e6afbf92bf248b4c57b13f66fcf46d03765a849bf279bacad67aacd5f02e1ef67aa2baace6c450b2a24dd855b2b2decfc88f26aeb809ff222ae SHA512 4f4d593c92d418077e7390def996024a343517abab3e97ce467dcdd2a579ea99ea02b6fd204b7694680e92b744757337986e0a52c43504ddd8c3c95aa772845f
-EBUILD collectd-5.12.0-r1.ebuild 20682 BLAKE2B caa3134d062af7b6ae6929f2f1b78b8c4a1fcc2fd60be1b58e8c7f3c1af5870aa7dbc439da1ba00ec1c828c6b9d8e7e27247418cedd30c0323c1a60fef607b11 SHA512 0f547bd52d7113c1ceb8f3d13baf17ffc53654f43aaa30a63414dc51a9da6065b155b6fbca2d1924f62014b36e151b1ee86c28d81e666ffa7ccfa16111ca1737
+EBUILD collectd-5.12.0-r1.ebuild 20681 BLAKE2B 6f6ef953c154dc3fe09efd2c0bcadf71146fd60d8269662a02680a42f4b8d866f757d93d065240d9ba8f81b4bdc758332d8de80636d3a65bd5b4aaba90a82165 SHA512 ea57b4c270dc654f8c6478d7c9325b7453d5259dd557154f09f029738754254e2a177c59b68177ce5068ec66bd1b2671f32050d7c4558768d757d6fa97a309ce
 EBUILD collectd-5.12.0.ebuild 20366 BLAKE2B 6aef9823acbf95ccdbea2067823db17498767687e5b5bdf28f9d6529a34b9b86804663e704cc0165eaa9e18e1b8632537b4d3879eeae7d10698bfbc076010a04 SHA512 ad46e3dd86e97a47aa42a4b95c854a9d35bd62374d57ca1ae70852c038f5005e320e094df3b6b30383713625a55d65d9a44ed140dad2ef92f3cda81e4bf41cc6
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.12.0-r1.ebuild b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
index d405d80f4cd5..fbf7cb81b4b3 100644
--- a/app-metrics/collectd/collectd-5.12.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 ~arm ~x86"
 IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d7552b4b65a5..a6c62c36fb45 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 0c76bcf9842d..ea43762f7841 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,9 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
 DIST coolreader-3.2.51.tar.gz 21575605 BLAKE2B dcd0b33706d675d0da46825b298b726c6c4ef041989b74619fb289ffefa3f62284d22d8ab0930f2866b1b01ae92f2acb8efe51fc8230d925454ed351b9c30242 SHA512 e7e4645c501c4999dd4a3069d3b11a634eca285da23c113bb9fe339ba9b519de994f972fcd65cf941ab6ec326a234af91ae7728689e3afe3f00ad2e93c08c279
+DIST coolreader-3.2.53.tar.gz 12550563 BLAKE2B 24543cac98349f4c0587149a3eb8f964cfb46891a0ed7c613a4a0bd644e8d24cb0ff057eab74aecf3c574e604d4208dbbee4c7023d8197282589184317312ee3 SHA512 4f500d877287b3c391cb0be7038586897e7c0eb9cfbe87d9b3ee3923db82c4ce04533249dee83a259a084bc142236cc5cc67f3e4428f05756da8c593a47a9558
 EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
 EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
 EBUILD coolreader-3.2.51.ebuild 1756 BLAKE2B 249d73cd0c5754eed0083e3b33836620be1ec53aeda9cd83100ad119ef8093369190dfd6765cd0cd615c5fa27cc1d69d37cdf22effbc728232c4209135e33f00 SHA512 2ab5f9f9e6e4f9a440cb81d52208d4399879558d7bb41e4310ad35401dd850e99d8abf525370c960f4bc0b91258ab789f14c130488c7aa9eb136ee6517aa37f3
+EBUILD coolreader-3.2.53.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.53.ebuild b/app-text/coolreader/coolreader-3.2.53.ebuild
new file mode 100644
index 000000000000..7c75f5c7adcc
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.53.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake wxwidgets l10n xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	dev-libs/libunibreak
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index a86fee496b13..1bb55b092eee 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -17,7 +17,7 @@ DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b48
 EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
 EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
 EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1272 BLAKE2B 77a66f4296ccae649a22dbce1b804c8025c0b2557d4632c71677a5a7a23007ae98df513b0d6b0841279f60c05589ce4f99508eec7eccd01078ea8660be7d0eb1 SHA512 8fbfef320c3e5760e774dd8788c5f400b3b6412a31730d22a8a7c135e3500aa303eebc7a2dba9fbd6758b610f956d7b675dc37e90f6d4c2ddfdb1d0434058ccf
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1242 BLAKE2B ad1d5bb8cfe599fc2532f42312e94f278fd47aab93caae99cdea0135bdbc940b03953c8f5f8643516db90dfb6fa158b05c8db9b2fa324f93c5c58c04b3800a19 SHA512 c85ce5031aac0c6ab02363f43aaacd9233c8b77c4a0945692aeb01c238b2d00abbbcf3acdfe1c69ddce8af5187740ef2a248088d0b0e395de1e9d122ebd65061
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1227 BLAKE2B 9fde28427fe6bd0682f12e67b0e13e9e2374f1d2520a917da1cf63ac2686546f835509f9d833f786b50561f256aa432bf7d0ec2e403552ecfead8e176d3cf22e SHA512 f99b46a247b75632ede4e7b60e39bace80019458285579b34c1fefe877e7ebb1b7cf09304e819d8e7d134bdb07a38fc881aab1362a976a14c009b8d457c8afd3
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1227 BLAKE2B c83633234f8ed449837093e831161c39346613159174c4bcb573602cbd1a50914046d982fa274e44b02280093c124f1b1ab41a67478d6aadcae36a4b9eefa3e5 SHA512 3954b4358b46ec6c09c70f49db9efd44988420f93f01ac2a03655e64be090c57cd3ce43e4bf3b4178f053f60dec13281999308ff763dc9f0f61937dfc411cfe5
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index 8f58b7ab5143..de80f946e64e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index d5b978fb3903..b73e50b18be1 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,5 +1,5 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
-EBUILD highlight-3.57-r100.ebuild 2404 BLAKE2B 6fbfa8a99cb1f37104a3b865dba125bcf356240a6c55772ab7e69997fbc6a0ca57ca77238149ec3497b5fb194354f3787ff61622190eca6a03e93132a41b0092 SHA512 171cde8c66962d09b4be1f28c5409e680a535d3ec2b67dd12d0c99d90f9f04f4225b90ea97dd4788cf7fe4868ebdc4bcaedcef65ee8e10995d73b0e6b466e821
+EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index 7cfbb9f2be8b..30e6ae8553b7 100644
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 4d4946d42aa9..bf9bf05dbc33 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 670 BLAKE2B cdd880755781fbddaba81f3ad15fbb9d3bf7a1f069c03e31de9d99db37b04de2178bdf16c14c789f301206deba7b07e06999c1536b1a9fe6e2252d54b5d0be7a SHA512 44023ec8d401b7ba2b2105ded5c31ae34468e68b1bf666a61d3f105939a6bd5ed08bdb9c1c430ebf53d51c8a985ed3a51ef2ad85d78eddbce4c93e3a1757c9a1
+EBUILD libgepub-0.6.0.ebuild 669 BLAKE2B 2eee9501484b5b4b1bd744bacef812746012f6b93adeab6975d8f3357e7c9eafd60e3669024bdd6b8cb3e6b9664675c215db8823abea07f141ba6cbbecfd8da0 SHA512 5d720999dcd5faaea8d8dacea17006a0ee627661f48bf7de00a2184d47f414f45730310c08ad6530296c94db011d66ecdb945a84d29d0487f2782717b4249fc5
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index f2b3935ddcb1..8410a7df7102 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index d070799e4a6f..3a7b441f568a 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -3,5 +3,5 @@ AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 EBUILD opensp-1.5.2-r3.ebuild 1996 BLAKE2B bca31a777164cf72923d05914b2529b11b3b9dd44a2f484b7bfd57c6c5eacafc609aafceefb573e5a6240866c2dd33980c6c9b220e8c868145924088a6bd386c SHA512 b77c93d4e06f1437c0e8ed331b5ea7f8e6c6cbd6b22bd43859752ebf7212882edc2bd53e8097cb246281353066fcf334e5f0aa84e69f848c41f3542b9c4114fe
-EBUILD opensp-1.5.2-r6.ebuild 2072 BLAKE2B 5312a2e895bd5b7335373a2f4d13773957d8a6eed9af8779b585d0661837543a50d4181dfd6c26d663441a52a5712bbf9ac62fe38835b1fa5d53d23346dc7de8 SHA512 873173a1c9df1a947c5dd93b6524c8a425c8f919459e69c78aad0f8901328c7e39979271dc6ee3687167ae98ba06aa69f01887bfb5d48dfa146105623c75684b
+EBUILD opensp-1.5.2-r6.ebuild 2089 BLAKE2B 2de671b2e690a7058d9955181ce2229e230bb1f2af2dceec8f56eb227be6eefea6a56baa44fe06985fc0357cac0013ad6722172a37b3ba379f34adf271f29195 SHA512 e68b5888f0351cf4921187dbb8b7247785ba040f3096afebd03f2a12b7d9253fc30915dd4ee08fd183518883259862ac49baadb3c78b03c789f2cf217e9fa19b
 MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 7288276a5076..a3c57f7e1b2c 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index d7a7670efb03..526ae5e001cf 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -6,5 +6,5 @@ DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e
 EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
 EBUILD po4a-0.61-r1.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
 EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
-EBUILD po4a-0.62.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
+EBUILD po4a-0.62.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
index 2732597fc5fa..3cd43355adfe 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1eb098b8ee5a..5d727f0222e6 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,5 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
-EBUILD qpdf-10.1.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
+EBUILD qpdf-10.1.0.ebuild 1312 BLAKE2B 96398fccd57ec2db02a17272edb0b2ae0918ec1dee1f47dd644749c483867ddc32c045144febe40ece9607c2d176f259954f0af2f6d1b022522832aa113bf651 SHA512 dd1b76121976f376b5643ecbede88e977ce03441c5c8cd10a5026ba393a45e51ab1f23c4574a8e1607155c48eb5ebd51194008d87383064ce4ec8b7765f3bf8a
 MISC metadata.xml 394 BLAKE2B 9f082b9d232876cce300488a5e4edd5ac46390af0a5cd21639093571b95ffde9771d74eb1ae664522796f6250c6e9c49e23f5e37e9819454dcd5b99ec97ba798 SHA512 b194bf416b11f76e04f300e0d3b6748302c9cfbda1f949f6caf9da07f297c26edbb65ada5edad820fa16c9fd971ebdc8202ad4f273ae5de3d01136f2cd95f6af
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index fa194fe13674..fbac000297d7 100644
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index eaeffb7b0ad2..c5fc12f779ba 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -17,5 +17,5 @@ DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
 EBUILD xpdf-4.02-r4.ebuild 3649 BLAKE2B 575cdd3db727f7efbe4f6146c5edafcbe763616e480cf28a7a078347e74d6570f817d5fe9db31a770b3dd014c370fa362521d0608e26a94d11b0bd49be8ea02c SHA512 c8b8a71667e9e42c401f74e9b609f867eff1eb0adc629b8ebc9726de389f17873ebdd321a1c0f694b366476deb41e4c907e383668655c490591892ada33ca428
-EBUILD xpdf-4.03.ebuild 3639 BLAKE2B f4be8a0d7c53315a9cd31e08f02eb7fcb740e376011e849daf4c94bf8be84b73c4fab14f3b91c88d29ce2eb47ca82028bea629a5356bc3aa109db77e4ed43cf1 SHA512 2979c5933346a88baa59cc78cc96111c48f8e9290d1ef5be792b2e2b4f73bfbd6eed678ab0bc6d3bbc8f566516254f541a2f116fe3265a14fd42aed841f20f7b
+EBUILD xpdf-4.03.ebuild 3638 BLAKE2B 25f40d78c916934b2870298aa088426db71263f275e78ede3857a00a4f00416776edac90cfc0c097f12dad73a51e9c99f858c5aeebe304df8bf11f91a996baf5 SHA512 189c7435b14e78cb69694069f4a5a347c56260c500620a5b289373ffe7288155575cd812630a604c2a788f2312291bb2d340f5528de5fbfc0bea7f7108e2b56b
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
index 486c4bc16290..07b37ab75cfc 100644
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index afcc0423b2d7..dd30f9576594 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/lfe/Manifest b/dev-lang/lfe/Manifest
index 9411e0523d44..4db23cb57e7a 100644
--- a/dev-lang/lfe/Manifest
+++ b/dev-lang/lfe/Manifest
@@ -1,3 +1,6 @@
+AUX 70lfe-gentoo.el 166 BLAKE2B 023b504e013f24662bded660def58f013ca9b34bc9ee73a137df54e48825e71f3a7322652e7cb8fd60e19b2a508180e1933c6f03be163d4a614fecfb6b41d96a SHA512 a15c3db1640229eaa2c1faa44f7765a53fdde29af78f8a9130c3b8893098cbc41a3cb322402ac5b9b0ca8373739b03723acdc3685d83724fafa6afaee0c25891
 DIST lfe-1.1.1.zip 386864 BLAKE2B d966e483c0490d7c6e48ae53819a0f1f30ea0edd7dcc6c7c3fe82c79ed0e4013d66dde4e74d4369e72fc46076723612f00ccb8d33d912d46dfdbf8e38940f72b SHA512 8660716a73126615bd0cde161a780cc49ba57718afd820dbe891da5e1d9ec2f52cc1864159dcedba1c674ccfef42b9662ec8e0bbfe82c10798527ae0979b8f8e
+DIST lfe-1.3.0_p20210112.zip 447903 BLAKE2B bc63fd7f988abba77e7f4baef906c2fd4370e1aeb2bc04b019d429586cbcb91792ac0f65a3d29a904997d2488a2540411c38e904c0208e2183a8f0f8362f7c36 SHA512 ee178436ca8aea1f1001e5f679a366414229f584cc0e0a38d9749b7cb49d7378a3f8681dcb8c1d5c61e4f498aa31c575a791fe21337b3079a11b623ada363de9
 EBUILD lfe-1.1.1.ebuild 754 BLAKE2B da0fd9924571e0cc62f2ee927eb26373eaec47ae1f5305930f2ba073287c19931de5839845bdba3e07ea7ab22030451425882a2bbc40aac7cfc97d4065d562d4 SHA512 77a131455692ceefb6310ace009525eeac0469f8105b16885e1a7a6bb8af2386104391774d44ce23d2d6ee9aa6635a882a1fe9ceaecc00da4ee312e3061e3741
-MISC metadata.xml 334 BLAKE2B 796f5cf618b8a2de81896af38e068a8c26e4681e4034214c713c5b1b450e119f76a1961b1a5097d81a8aeee446b0ffce124908757e59812ab2db0a93f1d8aefc SHA512 ef130013e56ca5d9df4312b106383b5d3d8d889f767ea24125e1a9ab11f555cab661c73ad190c7c0b4d7afd10a1e6d3569282233b4da4a76c7fbf1fc6052c8be
+EBUILD lfe-1.3.0_p20210112.ebuild 1453 BLAKE2B 5a4ae51848313c6310812fe3d551378f01c35db15d28425bdc466abc4996a69cb16dad3bfaba4dc72b83eb41eda167914ab47f17fa615b4e8d5c663e3fac6fa5 SHA512 30e02d290091ed700239518f267bb087a53238ef354ec6cb7b76f4b2ebff99009761b0e4c8fd469558d36c412cb6f78098c16300537f73d0f5a7d0db771e0cae
+MISC metadata.xml 588 BLAKE2B 532a17a48cf13dabc83a4ac1fae599cd24b7f661f20673cb1a1f336a0d2c0ab13491948788202adcec54c32a64b8245577501a462f261a1d785c9aeed536ec16 SHA512 c31ace8b52cbe4927e24fd42facf9e67b21b07f1eda7db7df1b8bd5ad0cee1748b72311c0f5b2592a80bb0f069a5943e827f146ba9929d224ec8c04072529153
diff --git a/dev-lang/lfe/files/70lfe-gentoo.el b/dev-lang/lfe/files/70lfe-gentoo.el
new file mode 100644
index 000000000000..2be4c13d18a5
--- /dev/null
+++ b/dev-lang/lfe/files/70lfe-gentoo.el
@@ -0,0 +1,6 @@
+;;; lfe site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'lfe-mode "lfe-mode" nil t)
+(autoload 'inferior-lfe-mode "inferior-lfe-mode" nil t)
diff --git a/dev-lang/lfe/lfe-1.3.0_p20210112.ebuild b/dev-lang/lfe/lfe-1.3.0_p20210112.ebuild
new file mode 100644
index 000000000000..17f438b3df2c
--- /dev/null
+++ b/dev-lang/lfe/lfe-1.3.0_p20210112.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common toolchain-funcs
+
+DESCRIPTION="Lisp-flavoured Erlang"
+HOMEPAGE="http://lfe.github.io/"
+SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip -> ${P}.zip"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/rvirding/${PN}.git"
+else
+	COMMIT_SHA="e5f20c459a13b35ed1e71b1d2667363af168e958"
+	SRC_URI="https://github.com/rvirding/${PN}/archive/${COMMIT_SHA}.zip -> ${P}.zip"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
+fi
+
+RESTRICT="mirror test"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc emacs"
+
+RDEPEND="
+	dev-lang/erlang
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-text/pandoc )
+"
+
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	sed -i "s|cc |$(tc-getCC) ${CFLAGS} |g" ./Makefile \
+		|| die "Failed to fix the makefile"
+}
+
+src_compile() {
+	emake compile
+
+	use doc && emake docs
+	use emacs && emake emacs
+}
+
+src_install() {
+	dodir "/usr/$(get_libdir)/erlang/lib/lfe/ebin/"
+	cp -R ./ebin "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
+	dobin ./bin/*
+
+	if use doc; then
+		dodoc ./doc/*.txt
+		doman ./doc/man/*
+	fi
+
+	if use emacs; then
+		elisp-install lfe emacs/* \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/lfe/metadata.xml b/dev-lang/lfe/metadata.xml
index afa3a329e3ad..9345ada5e45d 100644
--- a/dev-lang/lfe/metadata.xml
+++ b/dev-lang/lfe/metadata.xml
@@ -5,6 +5,12 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <longdescription lang="en">
+    LFE, Lisp Flavoured Erlang, is a lisp syntax front-end
+    to the Erlang compiler. Code produced with it is compatible
+    with "normal" Erlang code.
+    An LFE evaluator and shell is also included.
+  </longdescription>
   <upstream>
     <remote-id type="github">rvirding/lfe</remote-id>
   </upstream>
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 37ebb84422c2..79c03055c79e 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -36,9 +36,9 @@ DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
 DIST lua-5.4.2-tests.tar.gz 128901 BLAKE2B 10e4f0e8760f9cbd4761fa26665008ae7412539f79a6a7687029808f08f0ae4a24721e787e2e87e5080c16e9dcce8577a7a39ddc6d3e483a3cfe11756139594e SHA512 1516c59deca211c38444bbf97b18e988e939209b03915d3691d756eeed31b52e8d3a1f05b71ac0b561965274c7b6f3afc4244cd2e9069995696e737e2d9dd40b
 DIST lua-5.4.2.tar.gz 353472 BLAKE2B 7e0e642684df635ed1c48db45989e86a2638024e30a170addf700b0c7d32276f1eaef80898539c671039c20cb0bed4861b12c58f4b8211653a17e89bad278d87 SHA512 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920
-EBUILD lua-5.1.5-r106.ebuild 4022 BLAKE2B 78c5c866d2a621be1bd3a7bd4cecac3bfe24a9dd097083fe8099d789de7b06772c80090e47a0ed5550c8afe30fa6ffdc4dc14c4e7b5c9bff029b5649a31269e5 SHA512 5e637ff9622b2ea0bee7e2d528a516edaa378cf50e84f51dc78bb7282502f8ae2fef2f5cd1d25f9ac0c937ffb6ce19f93eaacacddd05d3bf7b73a07ca1848b4f
+EBUILD lua-5.1.5-r106.ebuild 4021 BLAKE2B c963cad02da07ce2df5b73a06473548781d51cbfd948c877ababda33565af38d43f346848316fdcfeb9b05a2f0744dbaf7f6a6494aebff86a1c6bcb2162efbe2 SHA512 6c51056df47c13630c85a0d9b94bcedb0c488cd82c9056b6d75064edfe5660b21d22b76b43317a50c52d87209e9d193770317332ccdb2cabf6e874ee227e679d
 EBUILD lua-5.1.5-r4.ebuild 3606 BLAKE2B d7e54c00e0604dd9f69143403d2bd58851266dee2ed8302ba89b44b7a290cc9d060852e234032fdaaa78908de6468ffa56e136174897658a669a2dc5fff4c165 SHA512 b87b4544134adec6089e0f73a71e3e337cfe5b40bae96eddf49e6c0f7ab9227adf0c085e355ed6b8bee85bd2a9b9978f27522e2cdfe57d3d67ce94ef28fbe9c5
 EBUILD lua-5.2.4-r3.ebuild 5761 BLAKE2B de71dc2127e1e3ddbf892f17f609d25075a09da46b5b9e4d7bd42eefbe863c3c7a0fe66367a6040aa14e3ec8bc0ca2625b4351520616cc7a879ed9dcd3c09c45 SHA512 55547dbc36a8009347d3325643fd4fdfdfc8bf39b12ea3e6317fb1357ebe4677bd6ec6142e4c1a6caf2716dd780e8817eb01514fdefa155b4b2fd7cc4622782e
-EBUILD lua-5.3.6-r2.ebuild 5746 BLAKE2B cf62e338a46c1551ea5f148c0cc7482212a19172ba5e816e89b392efa59d1a8f6ac61913a258a53d23ff6e992c4413f26762867d4cdf3c4d4c21061fd00b3f73 SHA512 2d36a01e8187c82abee5f60dc5a8fce2a876ef91454ba36f64c26e2bbc98eb2d2d2b457c7b0ee0292a0f400cc87e05a7c84148918d2934fc390a28dcb98f2668
-EBUILD lua-5.4.2-r1.ebuild 5686 BLAKE2B 58b165547c3f603939f1e2a62921e2c66ce334073b914ef446ef8b17925ed913f16522ad2686a429a0771ea816afb3919018ac875008b773b067a641a5696ec0 SHA512 68296cc3d7d716ed19a1dcd69ca4eed79c2bc48830420ed7d6cab4a9dff4e03fa063a9bc44f03d55774b4f6c4425f97b61d1c8ab367e76779c312dc5449c884f
+EBUILD lua-5.3.6-r2.ebuild 5745 BLAKE2B cdd11a3e0856f3d7523b7194105c9176cd8be98540f8365f9ca05aeffe19c2d762b4af0c45082da9a1beeedae62a6bbb969322cfea45ec105f98de8b6f4c4f6a SHA512 0adb76325bc8d939e23fe321abde0a4b158ce6c234b9eb4d3f8c11422e5855f828de45a0cd25283f7c104234e0bcc5dccac7574c9cceef5a8e3a89f78b5f00a0
+EBUILD lua-5.4.2-r1.ebuild 5685 BLAKE2B fa8823d2d6cdb7089f3107f17cf490f644dee154f419176e9836ec045bc4994e220567b839ab9676a8f7070248a33021f554ba18844eb6394c05d444eca1d210 SHA512 6e8a14ee45612db2c20083330828ccc5bec232e53814d8e6b57b08810e480d004d8cd2dc6d3749ff7b93ed5d595eb8eace4705d3b9ae7b74b81b89cb8731bc58
 MISC metadata.xml 524 BLAKE2B 688341a9dfa433bbc2e3fc1edb8a44d53dcee036afeb5b2c7c8fbfa0f81d1e53a6c7910b32bec637ad1cd518e48afdd0806a286dadbb6c7a88853a93aa7f3545 SHA512 92ee6e13c3fcc5ba1d2cf3ec58a54b051f1fae8646b64fae25923108a78abc77b05992abbed5a04afbc2043ea0b47749544e348506ab554d57b19bcf3b435e52
diff --git a/dev-lang/lua/lua-5.1.5-r106.ebuild b/dev-lang/lua/lua-5.1.5-r106.ebuild
index 7da97a9910c4..eed2660a7619 100644
--- a/dev-lang/lua/lua-5.1.5-r106.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r106.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline"
 
 COMMON_DEPEND="
diff --git a/dev-lang/lua/lua-5.3.6-r2.ebuild b/dev-lang/lua/lua-5.3.6-r2.ebuild
index b6b2375e5e19..c8c7115635eb 100644
--- a/dev-lang/lua/lua-5.3.6-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="5.3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 
 COMMON_DEPEND="
diff --git a/dev-lang/lua/lua-5.4.2-r1.ebuild b/dev-lang/lua/lua-5.4.2-r1.ebuild
index d1d1b431e953..d67a54a5a603 100644
--- a/dev-lang/lua/lua-5.4.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="5.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 
 COMMON_DEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d422e17d5bd7..54e5dd1ebe67 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 3c0fb443618c..c4966cb165a4 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,6 +1,7 @@
 AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
+AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
-EBUILD crypto++-8.2.0-r2.ebuild 1728 BLAKE2B 16a66423eacd0ef476c55b2ff1ac59d074a7fafdce464d7ad5b8d04769b2dde7f098f27b7ab9986ba686f29b168f1d44213bb45f4fddf6223a095f24525a4378 SHA512 6e37f760a975c95251c5919fb30f9a6311a0f5191c9ceb8984ebf7d7283558010fbb60af5f57bba5b73f25197eff43475c47dd0eb8807e97a04f87bebc6b5308
-EBUILD crypto++-8.4.0.ebuild 1136 BLAKE2B c702de85bd70f44ea48a1bf8758e754db58c9a9a0984001ceff212c1d1acf6a3a8c5b48765642e5472e829116f2bf21da106dc51a287bc7a634cfb1366a08138 SHA512 9de2d0ed2bfb4a313f95250ebb2be6322789ef37b9449f52b1a54d77046192b37e152a0d6a91fc5fbb406b1f182f89736f7af3d711438cb1b07383abe6909eb2
+EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
+EBUILD crypto++-8.4.0.ebuild 1196 BLAKE2B 40ef68935a522fb3ad24f636f88aa1e174ca55c7c87d939d9623db6a86d54e34ff6f016fcb133bfad8429503901a9add537ddd4b35551c096339947a0b02e714 SHA512 7dc7c6e3f14c2bf032cff6ec2a7129934263c917b21094d683c55addebafe46ef8a4daa51e699d5d75ccfe6a7db46ff478dc5380c302bddb9ecbd5909ac618e8
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
index 1ffe175e83b9..a52ee90857ea 100644
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ S="${WORKDIR}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
 )
 
 config_add() {
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild
index c28c2e43f1c1..ed056d9020c1 100644
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild
@@ -17,6 +17,10 @@ IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
+)
+
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
new file mode 100644
index 000000000000..2ae8d287e12e
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch
@@ -0,0 +1,24 @@
+https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch
+https://bugs.gentoo.org/762997
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -1256,7 +1256,7 @@
+ 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+-	$(LDCONF) $(DESTDIR)$(LIBDIR)
++	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
+--- a/GNUmakefile-cross
++++ b/GNUmakefile-cross
+@@ -732,7 +732,7 @@
+ 	$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+ ifeq ($(HAS_SOLIB_VERSION),1)
+ 	-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
+-	$(LDCONF) $(DESTDIR)$(LIBDIR)
++	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ endif
+ ifneq ($(wildcard libcryptopp.pc),)
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 70b82a0e4c4b..85b56c87fa6c 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
-EBUILD libmanette-0.2.4.ebuild 850 BLAKE2B 5d8418fffc9aa73c67988757a097ea7b796e067fd81257f4b9b2ff958343978fb5dd99859705886189e3c91ce21ba1cdb7556c9f74229751266bd7dd2a3af2b1 SHA512 acaf2a0cdea40bdc4f78f2f83cf5352b7a0eae0e8f7fc0d2ffbf8b8a4d39e18f35cdc910f06a24a806f562f9b977465f8dabc665c13c8942cae5de81678ea7c7
+EBUILD libmanette-0.2.4.ebuild 849 BLAKE2B f42331170f56c44740a778eea32b77405e29ae79a6dbee0f29446fc22cab8f800337764fe53eb814e4b70b086c5c28552530c3b3e51c60446911ab744699496e SHA512 57be95d03221affd6f6a25810ad8822cdde075a22d15e3d2c39aa9300a4480d8c579db4f17daa26349153b4d60ba8d650746fd376f097322666ce31a20e537af
 EBUILD libmanette-0.2.5.ebuild 853 BLAKE2B 41f584636080ac56d20dc2c9780f0cf6a00686b45d6d2dde2c309cf7e27c0764a0c431e46c0faf3d7ef538e3bd2f2fd08dd1241b2100f0ae4940f79fbee33e0e SHA512 103ac11b72f7a137ffa76e02101f15b17e5a9ae133cee53bf6ea524f43fa8aac0bb08c2c1b37b97b82968d5b324a2aa7fa1928abad6999f4e9192475c0127fa8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index 4b17eeabac40..5dd153d6043b 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 2131e8860ccb..0605b156fc01 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,7 @@
+AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
+AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
+DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 1b9ccb93bd4b593b8bd20636f14eacc6d5296646e8e76a1feee4c5858297f65c5ad60d0540683bf3b121c9c0dd7bb74a46c9348e78fc4f85869dbeb2c4c890fb SHA512 9960fef33434f9a272eda13e30a9dc8379f454922b46879a9e137a535e42e43cbb7be9f7ffe291a106e5ee47648b3a201168c8f6d37f6b5350c6007b500903b1
 EBUILD pegtl-3.2.0.ebuild 624 BLAKE2B 7e06d9933634b397cb7217c8558e0cfb0ccd9ba58301a38862d27a23a526200e3c9bc8f19bcb2a689978e9700e47590553aea555bc8607601365c4558d7fdd87 SHA512 0d4d90e70405a82918e28a04cb67361e838c523e8129e317f051b0285a2cbeb64acad998f4880adf746a0b66e5f62da7cc2be674f172580b88bd346a7d49b51c
 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
new file mode 100644
index 000000000000..140e1f5cfbb8
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/CMakeLists.txt	2020-12-27 00:00:15.886046938 +0100
+@@ -78,4 +78,3 @@
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
+ install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
+-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
+--- a/src/test/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/test/pegtl/CMakeLists.txt	2020-12-27 00:07:19.122766830 +0100
+@@ -123,7 +123,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+--- a/src/example/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/example/pegtl/CMakeLists.txt	2020-12-27 00:07:32.970832890 +0100
+@@ -48,7 +48,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+ endforeach(examplesourcefile)
+ 
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
new file mode 100644
index 000000000000..ef418e44254e
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
@@ -0,0 +1,43 @@
+From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
+From: Daniel Frey <d.frey@gmx.de>
+Date: Mon, 11 May 2020 22:19:31 +0200
+Subject: [PATCH] Repair warning from GCC 10
+
+* Backported patch thx to Fedora.
+
+---
+ include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+index 7ec4639e..ee0a3782 100644
+--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+@@ -45,6 +45,27 @@ namespace tao
+             }
+          };
+ 
++         template< unsigned Max, char C >
++         struct rep_one_min_max< 0, Max, C >
++         {
++            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
++
++            template< typename Input >
++            static bool match( Input& in )
++            {
++               const auto size = in.size( Max + 1 );
++               std::size_t i = 0;
++               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
++                  ++i;
++               }
++               if( i <= Max ) {
++                  bump_help< result_on_found::success, Input, char, C >( in, i );
++                  return true;
++               }
++               return false;
++            }
++         };
++
+          template< unsigned Min, unsigned Max, char C >
+          inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+ 
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..207b474188a1
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/PEGTL-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 733678
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index bec68778ab30..399d3e0d9444 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -2,6 +2,6 @@ AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
 EBUILD sord-0.16.6.ebuild 1207 BLAKE2B 5dd477d558144bba5f42212393bdd61c4484f9b860404970dfa89d04570055a23059e96896e11295111a9a6ec4cea05f001f28b2361d466fecfb73e00695fd88 SHA512 7618731c519bcef759234e6c545320d120860b73aca0be480fe4b975667d437c4ee4f92f3cc8597049ec8121ae3657c2c3b486fab8ff09ea4e421bc06e3354bf
-EBUILD sord-0.16.8.ebuild 1181 BLAKE2B aad240adfa5d95e5db8940ad8a5601d8229daef202e65071686000f51eda6c0c473b1d139ce5d6963b0e9d0ed12c255b2793a9924ccb8053f8f926b9c43014d4 SHA512 112f336aab18248c491038ec21499dc32ccf5997389b5e72685ce747998bb1c07f54adf5f67704bf5b208c3ce277f176b03a958fceb17513462ab27324a0d082
+EBUILD sord-0.16.8.ebuild 1179 BLAKE2B f7e0bf7f9e082fa3bbaef6ebbb39e39e63a36434b746eb17f599826360c2cf2514cac5328bf55b91d5591ec01aa9ea50ef9e3e025fbebbeb68342185f0f2ccc3 SHA512 3eab889a9c7d4895a5f9e9388f32a0f7f8c2f7e3eb1989c20df7415977075bcaaaeb1922ad19bbf3cb30dfdc56df54ff696528500e394fae87913fe5d679eeb7
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
index 0e23c8c7e16e..d4d60b68523e 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index bbeb11d341e3..73e6d8e4a869 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -12,5 +12,5 @@ DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 EBUILD zziplib-0.13.71-r2.ebuild 1687 BLAKE2B d25b7136cdd1649653e22168da5e7d5a634eb838e233995cbae2051f3517ea935d2188cc79c772883d8b5e91fc1aa1215e3a20f4a5e6ef09b0a6d55130cae40a SHA512 73827f6e7ede1e797731c2e3ce54927aac0856c40fb55e85a4acda4d8cb0a7088556bb422205d688efa5e19b817e5b04f5287e9944416303ed5d2d00cf864285
 EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 2a5ec064cf753856e95f693c3c9f9044226eae7f931f98f0fea5bd145228422c340e7ab7712e05dc98f06d9091bd5f4c7ff31fc0983a856c391887c16d7b97ec SHA512 064f7881a753eb842e0ae6b449e818652dfc2f6abc07a63230c0ea8f49c6419ca880207317d6574c4dc1790e034138448a279947c6a857cc75675eda2abcd147
-EBUILD zziplib-0.13.72.ebuild 1267 BLAKE2B 30cd6f184c166896e9c791c5a677e6c9756b1cd73f3eb80ea9e643c315cf275f2549cf46b7969e99b4d97d74e60bada11cb9d0774d091c87f24380b8948e996f SHA512 43b0dcc179ebc8614cf5e87f9409868884567d8d028ea607a867e20ada6dcb4a4042befbbf333ad0deed5fec891fa6cf066ced1e094fb8e730cb264de036f1c3
+EBUILD zziplib-0.13.72.ebuild 1266 BLAKE2B 871fb04407fa40812fb96cd9fa26c7ae9a3c4f7af60a946cb220946d51ceb7787ce3a391ef7780f98b4627ef8c9a4f11dadd13f05297429729f93b74fbcabe8c SHA512 cc2a2e2d87e16055b8c9816638123a9176fb86d4424616c83140ab70205218c2f0e65d5ffe4b446c3a32a9bbbd16e24827c6019218187d88204baed572d94493
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index 51c4c3d95071..693324c3e35b 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 51fd104c6239..3d6da9aa1128 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index df22b4c98065..4ced704c21fe 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,5 +1,5 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
 EBUILD lutok-0.4-r1.ebuild 743 BLAKE2B 039c1b6be42b9b53bc0b9fc5fbce9db09acb333d71c6d95ad79fadf32c08c0bd205b4917d7300f8f81d4b556e34a6a0919b98020c3fe9a4f8cd051a3ed4df1f1 SHA512 2ee4b75dc6c354ed6e6333edc161f2cb80e8d1f7916747635b50c3468275c70fe193ec896a7071ac069ac042c2060d8bf323df0d2b520073cbc2390e83a010b2
-EBUILD lutok-0.4-r10.ebuild 1007 BLAKE2B ba21b06e3aca46523f3dd30936720ce6e2ae361151f33b5e1015a2f9fed8b6c1b1c3f47dee2f386c2a2dd145697838c932e03b0d8acc1a21ed931b1facea333c SHA512 2b307a06605962503c46d9c9f0993c2b9ae6b48aa0a8ce1d32aeb30417648e98186f3b066f878062af58c07b3aa14917fb77c1feee3070871a1a369e5741819e
+EBUILD lutok-0.4-r10.ebuild 1006 BLAKE2B dd75ed81ad2ee69dd801beed2378490a5d4797323bb9df2da40e9254990c39488bdc7aa3fd14a2cd0bc1d535d4c971d798c9d03d002e6b99b90c31011cc74574 SHA512 cd4a7287d4df50af8df759969c35042af57410c7aa116a1b55b62ae5a289e05b7e353de082540ae9f141ab03ad2a9b7f6b6c41cb91ba205a7489848895c6c115
 EBUILD lutok-0.4-r2.ebuild 826 BLAKE2B ccf9433d02deb2f67b523bb8a46139fcea4da8957d47f2a6f1bf65a2fc6b9f7f641371ad2b489230e0089e9ed1db4e754acfbef6b791c57f4495cb83e4807ff4 SHA512 327ec4a80919cae9504c165f384b0852147d47c66f89df6f5fc0f7cd213311b46c05ff554d0f12cb028c875080dd2c5d38fc100d41132f98a5ab835ba75c694a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
index 3952247930d1..df4e158db77e 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f9f0fbf2b26d..bb863806a8fa 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index 8aceacc3d0b9..8686d679abf1 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,3 +1,5 @@
 DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668
+DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
 EBUILD alcotest-0.8.2.ebuild 642 BLAKE2B 882f487e41026d7d61b9b87feb03cde4c88076842e946053bc846e55bd708f416ea4eabea1d0d4fd25d1f9e8e86bee325b8bd00abe9d399b7810ab5bfdb004c8 SHA512 55f2359e9f260b46559c86190268854c925a9c5771e8072ab99f7d82cae7ff9a8efff36f5a0ddea83f6bb00aa119baf51936d44be56e8bc9f130760ae504f9c9
+EBUILD alcotest-1.2.3.ebuild 543 BLAKE2B 3c81de7fdd7153948717fd728f30cd93ba026f13c589ef9a3fec7a69ce9f774876178a23d854e4247af69e9c3338369ff551d9802805267a2fe93e04f6b49f23 SHA512 84b370072825035e74d1c111166b9192c4b632d7a5795ca5ed0a398d0315ac3401d00712f09d33df6cf3e2f6fed73a5813af2a0e97843b2bbd0bc4398c831b35
 MISC metadata.xml 247 BLAKE2B ddda0ea2f5068bed824871d1b734188ba122a58d22ab67fb491beb7d48349ded25fb96d6c95f0efa4c756d44a7e30d8a78b0a2b8020fb35b2715c4ea3b41c02a SHA512 4fda15644be2ad3faf61b9a05fad67cdb8ac023dd63de9e0fb034396a38c512d51721d299e07881521fac159d18ba7561fa614980b7ccb60b741fec24e1ef609
diff --git a/dev-ml/alcotest/alcotest-1.2.3.ebuild b/dev-ml/alcotest/alcotest-1.2.3.ebuild
new file mode 100644
index 000000000000..1e6aa8f2ee18
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/astring:=
+	dev-ml/cmdliner:=
+	dev-ml/core_kernel:=
+	dev-ml/fmt:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index a501702d41ca..3c4fd9f3b68a 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-client-2.0.7.ebuild 761 BLAKE2B d5109fc827941ca38c2aacd990413e663af88039c33c0eb1d7bc78d2af5dac8cc8d23060a4cb7a6b2c82c9ba99e87095fd3a2dba66a26215267dee93421e6133 SHA512 3a08ab42ae35d934ac1c87cae2d864ba3ed620ab18b63c8216b85f976eec71006c6583abc821ddd67f73e90da339edfe968cb15e5189254b81ebdd1ae253ad97
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-client-2.0.7-r1.ebuild 805 BLAKE2B d0abd7f2154b1cd7c06feffdc9363134bce9d0d6f0528e9d4b231a61cad37c80b62ee127458eaf2e3194a727d1ef6b73340bb3c79a5523b184811e2e27d377c7 SHA512 e1bc63922a380b2bcac4586a44ab8b94aa3f78f1b591050d0cc79090a764e088345f3e3bf5607d9810f14a62f7e30592d7c1b147428c64dae2ba0fbcdb158e1b
+EBUILD opam-client-2.0.8.ebuild 804 BLAKE2B 1d4da2ea5e09ab42ab85380f09699f481abc02ea9d263a6a4438279319c51d122bb3d478b4ec16594785c112040509354736809af34bfa0ad4d886e33e3d4787 SHA512 f07c23f407655ffe0b22d287c2a182f054e02d6836079318383fcbcfe41922fe8a371def5afd0e7e6c7d365b709431899f37f94f0030daa371d7ce2af62cfbf6
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-client/metadata.xml
+++ b/dev-ml/opam-client/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-client/opam-client-2.0.7.ebuild b/dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
similarity index 79%
rename from dev-ml/opam-client/opam-client-2.0.7.ebuild
rename to dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
index f9a4f7fe06b9..24d269ea2677 100644
--- a/dev-ml/opam-client/opam-client-2.0.7.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,11 +15,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/opam-state:=
-		dev-ml/opam-file-format:=
-			dev-ml/re:=
-	dev-ml/opam-solver:=
 	dev-ml/cmdliner:=
+	~dev-ml/opam-repository-${PV}:=
+	~dev-ml/opam-state-${PV}:=
+	~dev-ml/opam-solver-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
new file mode 100644
index 000000000000..a558d84098a0
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	~dev-ml/opam-repository-${PV}:=
+	~dev-ml/opam-state-${PV}:=
+	~dev-ml/opam-solver-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 7856a8276593..263886bac465 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 EBUILD opam-core-2.0.7.ebuild 881 BLAKE2B 5317553f7648ebd3342b41bc79df2551f1d273c3e56cc9a005389da88ab4c0c126bb33852e8c7ef28d3f67f8f4a00866b67e0baef67821ee5edf9592d38f710f SHA512 046cf40b69c68f5cc46c0a27eef99e637c4d22afbfdf55a9f274ca40673b42de50db97193239c49dfbcecc98b986fbc551df2bb6ac243fbe22435d7b4a0faf3b
+EBUILD opam-core-2.0.8.ebuild 834 BLAKE2B 8c74d756a4902d617bad63a9fc2645a04678e5ccf17e54b7062a25f98174171a700372bcc8deb32172f2357383c180f7637cac6c0dd287e82d010793d430510b SHA512 6d373374771d908dc6e659e5e138ac580fac53c2ecb0f5b6995db6a35c34e648dde63fda9700ffa877a8ee1a479ed8fe5411dc70acb8dc29bae576c7593dcd0e
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-core/opam-core-2.0.8.ebuild b/dev-ml/opam-core/opam-core-2.0.8.ebuild
new file mode 100644
index 000000000000..9d6e32634c0b
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-ml/ocamlgraph:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9)))
+		 (release
+		  (flags (:standard -warn-error -3-9))))
+	EOF
+}
+
+src_compile() {
+	emake -j1 opam-installer
+	emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index 340a14482158..bf2a788acac0 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,3 +1,5 @@
 DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
+DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
 EBUILD opam-file-format-2.1.0.ebuild 728 BLAKE2B 6750f5f33d722c8d2ca34fedac9317b01e3cf146f6bd517ff86b88b8ae857a65a894622a9c035372f67c2b601cdf91e0caba901234da5ce633987c79eff9840f SHA512 2d5e16e1b431be60174d0ef49ddc78f3696503c24b90a934fd60ebfc021f0fc56bbf73c13f096e40d46694d1e3befce3581f4a1745c526a06c82199ebc3eace2
-MISC metadata.xml 331 BLAKE2B 751c0b5766797be20f0bed7ef34e0e09ecc3c374e57e872f861662cb2cc950797d977c96edb5666390ed4acad198b92cab8eb1f3990daebd30fc47a121942a6e SHA512 1947996742f0cf50068b4bd36a75605ba80bd268b3b89c4a34686832212fa5eaf1c74430f7a1ff8ef577e7a69363f8bb2313f9a8c69ab631465e12f9b58900a6
+EBUILD opam-file-format-2.1.2.ebuild 549 BLAKE2B 221f11995cc401d9c320b69f1890bc47b3bcacce15d1878b7afd156d5c84f45b5db87cc63aa62687246b872e426e10ea1d6132cac152b3a416081462a1017829 SHA512 5330fdb4e1c8b854d868f1c1fe6fb66df548b94b63c4556541a69ebe1add4cb3cfc62884a778980e18f182c53b70b47c14a6bbef52f52723270c7fccdd498be2
+MISC metadata.xml 424 BLAKE2B be67fa815545cce58cd870b84438927044fdca0ff12b9498217d3d04fe1e68981409e5c8d5b040da85f7969004cad18260b3bd0e105234f9ddd55271aa12c434 SHA512 282c587f3927e29035d987cb102c4b9042081d758787831335d7ce6b009193f7058e5c5e4e1ba5db3794e9dbdc79f2203e93783304f908aa26ffc7ddcd87969b
diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml
index bd15aa2f0672..e96aa44304ad 100644
--- a/dev-ml/opam-file-format/metadata.xml
+++ b/dev-ml/opam-file-format/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
new file mode 100644
index 000000000000..55d2c8ed6c8e
--- /dev/null
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-rc}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Parser and printer for the opam file syntax"
+HOMEPAGE="https://github.com/ocaml/opam-file-format"
+SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-ml/alcotest )"
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 01ca2a4322f3..006f46086571 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-format-2.0.7.ebuild 862 BLAKE2B 0316aa5785f1ff0a234f3db0caf6a6179686ad733f52e7b4f4f22f2d38fd76ceea0d2ff4e51539b97f54fb6b275054a69a30bafb5f30390d29cfaf0f7396c011 SHA512 fdd83c330936dc436d1d56131b384d2ff729c293558dcd321358bb3c9e384ae15ff545b98da81378a8acf9107155ab28e91db9a99b80fcf261f4abde78b6aeed
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-format-2.0.7-r1.ebuild 860 BLAKE2B 1c0868a025b6d5540b09aa1a058268042fd22a908adec56bba8bde09e7c743c201b9bf2af2f8a0ccbc1817935792a23e27bc91566bd0c7e09718fbf1ae69cbb8 SHA512 8abd418ecb15f0a02a9153ac743f8e855d0a664e6c6af4d85dbe66444fca770e60173cb19e2905f2c3287dae710ad8dee05474030fb48cef0a7446312a270c2d
+EBUILD opam-format-2.0.8.ebuild 774 BLAKE2B 24141ef92b5284c8e80a6d1906c6ea714278033c2690f91916629b60c5ed50fc9031369ff45093ca3a2da458b7f8897b345a4883cd876b8d69b0e1458e8258d4 SHA512 97bc18849b775dffed3d3a143678072c378bc5dfab724784dc3491b4493434bb4b402e2c0d3983ac0966ceee3a1835277027c60e828b51014871da3143828dea
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild
similarity index 95%
rename from dev-ml/opam-format/opam-format-2.0.7.ebuild
rename to dev-ml/opam-format/opam-format-2.0.7-r1.ebuild
index 03f9db26f553..d0390991ada8 100644
--- a/dev-ml/opam-format/opam-format-2.0.7.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.7-r1.ebuild
@@ -15,11 +15,10 @@ SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.ta
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="
-	dev-ml/opam-core:=
-		dev-ml/re:=
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
 	dev-ml/opam-file-format:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ml/opam-format/opam-format-2.0.8.ebuild b/dev-ml/opam-format/opam-format-2.0.8.ebuild
new file mode 100644
index 000000000000..760515d954c7
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit dune
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index d36893a9b76d..740cb8796516 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,3 +1,5 @@
 DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
-EBUILD opam-installer-2.0.7.ebuild 996 BLAKE2B ed78f3fe94aac3691ce8506709ccf649debeb6171068644062c74a561c3642ad1fbc9dfffcfc168b2f449984b86d22baeecf5e82dd957af360c87abe29131b6f SHA512 41bb0cb0320b9518974403bca3a3dc44db6056e8e3a12d4e85245293f6a40f89aea805ab6a7e0268049adce012a460e36d970cd01cc61ea179faaa4e29775993
+DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
+EBUILD opam-installer-2.0.7-r1.ebuild 1045 BLAKE2B a25548d0b9b47cf10061c5e7ca9f8c9a47aeb0ce20ba3d49af133a59510ae815da8e8de2b3a5fef5494283ad682548cacf5f6f5b828806f22ed0fe9541a2b7b3 SHA512 f46c69944e47e40eac40c4ff93c860e7f83c59fc3b1964bd478a4b5544c2e4b0ac7faad2a8896f7d70f3e338e457d3a00742441fb9ea1199d8df87236184e25f
+EBUILD opam-installer-2.0.8.ebuild 998 BLAKE2B 85dd3b5700fb748994e9330112581167cdfd3d0d3f071ddc08830ee2ee54b2a4d85db42d46b15b99e35df54383dc3002f75a4649fcaed246921252ea0590e0ce SHA512 89f55df1ce506497feef84050b356d3f244a8f47f114175b3cd367be22be7d1f1a1f89cb19b5a501cb47971dbbfb04281e13213b1a711eadf8d3236791b2d7f6
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
similarity index 92%
rename from dev-ml/opam-installer/opam-installer-2.0.7.ebuild
rename to dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
index 59f744994a07..eb52254c3965 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
@@ -12,17 +12,21 @@ inherit opam
 DESCRIPTION="Core installer for opam packages"
 HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
 SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ocaml-4.02.3"
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+"
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
-S="${WORKDIR}/opam-full-${PV/_/-}"
 OPAM_INSTALLER="${S}/opam-installer"
 
 src_configure() {
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
new file mode 100644
index 000000000000..a6722cf81e76
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+	emake lib-ext
+	#passing -jX to the dune build leads to errors
+	#see: https://github.com/ocaml/opam/issues/3585
+	emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 4bf4a616a820..8ee4403f90b4 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-repository-2.0.7.ebuild 755 BLAKE2B 58f55bea8bc596b724fd507a896aa92344bd5c9c1f5221cf14354d061b420863ab6ad416f13c05feb840ea3928cf4e4a0c8805596d202eb28b8b23a8f8f04385 SHA512 224ab1242de083f3c5a24242c0f8c418c5fead9f11bd7fdd1f81d700a7a089d5baab8f14c03b9ab15ed57b8e16fa0ded4184d73f10a7d1a68894f13e086a1102
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-repository-2.0.7-r1.ebuild 760 BLAKE2B a286db2f3a0bd8de0d856ab8dbf1f577b7a06e6b3635bca46f7de51d04083881b7bed7c40806d20eefb268e1fcc2d23a69555144b010644dbe0dd9301e50b550 SHA512 47a9d906bfcb548efe2c0a412ada748ba05e63b80eee99579d732ed77fcdf5fc233733d2fed2018b2f482a9afaa2022a535a05408b0fe6858e532c6fdbe71ce6
+EBUILD opam-repository-2.0.8.ebuild 760 BLAKE2B a286db2f3a0bd8de0d856ab8dbf1f577b7a06e6b3635bca46f7de51d04083881b7bed7c40806d20eefb268e1fcc2d23a69555144b010644dbe0dd9301e50b550 SHA512 47a9d906bfcb548efe2c0a412ada748ba05e63b80eee99579d732ed77fcdf5fc233733d2fed2018b2f482a9afaa2022a535a05408b0fe6858e532c6fdbe71ce6
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-repository/metadata.xml
+++ b/dev-ml/opam-repository/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-repository/opam-repository-2.0.7.ebuild b/dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
similarity index 89%
rename from dev-ml/opam-repository/opam-repository-2.0.7.ebuild
rename to dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
index 11652c5bbcb6..c0970787f1db 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.7.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,23 +8,22 @@ inherit dune
 DESCRIPTION="opam repository libraries"
 HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
+RESTRICT="test"
 
 RDEPEND="
-	dev-ml/opam-format:=
-		dev-ml/re:=
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/re:=
 	dev-ml/dose3:=
 	dev-ml/opam-file-format:=
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/opam-${PV/_/-}"
-RESTRICT="test"
-
 src_prepare() {
 	default
 	cat <<- EOF >> "${S}/dune"
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
new file mode 100644
index 000000000000..c0970787f1db
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/re:=
+	dev-ml/dose3:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index ed70e4959c4c..2b3b32f15e05 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-solver-2.0.7.ebuild 826 BLAKE2B 3812fd475a39b6d5bce2b98f026e08e9741c757e6cd63bda28c4eed4ef7991a441623f2c9ef956613ae7c9c99431b24a9985c7f76d4f0c81f5fe78040da141c2 SHA512 fbe9b3452115f0fd3d484c1e5ed985e6277503ed5a45bb2884b504221e56a5dc09f2625b73f32b920d4a1b50f860d86d5fc78ef688fd6c5fc0a9adcfafb25d64
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-solver-2.0.7-r1.ebuild 831 BLAKE2B 7ce493c866aecd1a0897021c057ed094f04a5b6feebb9faaed89a8d7d63aa6bc5e531a35f28071d5439e26caa3bf5bbf7d0602e9d1837c448d1aef9d4feaa654 SHA512 3dfc47038307c97775b4c409f7b18e70cc796c55db40ca7137bf02951695d53f171a76744eaa1906e0074de1ddfe0fc68c475623864e5d9d719b11e3681dc947
+EBUILD opam-solver-2.0.8.ebuild 830 BLAKE2B c5cca3ae9500f6594b9ef03f17ec495c23498da22b8de30d9bbfa1461b61bd08be5489d1782c1b7e6a062c75d395089cb54636853f8a20ce4466da2c10e6cc0c SHA512 af401c71a7395b6a7eca1ff64d9a1d0a1dcb75e3ccd37d5068fc0ca3b9938570dbc54e509117125e9381c036d722af831e849248332bd5bcaaad3e987b3d8941
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam-solver/metadata.xml
+++ b/dev-ml/opam-solver/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
similarity index 87%
rename from dev-ml/opam-solver/opam-solver-2.0.7.ebuild
rename to dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
index 9183ce40afde..3613f874ac62 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-ml/opam-format:=
-		dev-ml/opam-file-format:=
-		dev-ml/re:=
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
 	>=dev-ml/mccs-1.1.4:=
 	dev-ml/dose3:=
 	dev-ml/cudf:=
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
new file mode 100644
index 000000000000..5dbff3d50da3
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+	>=dev-ml/mccs-1.1.4:=
+	dev-ml/dose3:=
+	dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/opam-client )"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 3165716c2fed..a81add807844 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,3 +1,5 @@
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
-EBUILD opam-state-2.0.7.ebuild 738 BLAKE2B 06a42200b392ee033a9abf9baa3ffd2f9e0e07d486c8f788c86c615ca280e14563f49f3712a09185d704d5aa60ca78dd0ee8ca27cc0f3272cf5215b717e9919b SHA512 9693f5b0919884dd311656677661cc4e17302630c3f04d38b3218cb26e3d0bbc10a96124c7306c9f2c9b2b53490f616f564e7355118652df0d394262a7d015ea
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-state-2.0.7-r1.ebuild 744 BLAKE2B 583a7ce5e4ade97f0070ba65a556e013268e1ad11b0f5c57d56616ddf758252d97b0258529c7ea6e56511c45827368406ead588f157cb98dfd0d39b99b1b0068 SHA512 2505c06f7ec1aec58dd2698c5c5d1cf5e17861d4f88e9d79a1f0a3d4b533529e03f5cad3e6a64096f3e84e1e0e7d8400f218e30b42fbebf3b6e1dc92fc81ce62
+EBUILD opam-state-2.0.8.ebuild 743 BLAKE2B 1df56bc0cf1e8efedc74f58a89d1f67e8ce67dc35f5e70b151ed2efdd7addb5a36a647f4622054a76bcb22df4f19c2963598b06dfc288a7d0a4405316b9e8776 SHA512 c3667c5df67384d4220721d6141b22b8ed3e55e76cab1e96b580f293e78c8161ca2b4a20b05e605ff0dda8167681fd7b3748af314da739a9785852a4358fa31a
+MISC metadata.xml 411 BLAKE2B e34782e7a855867a5bbca4ba462df94b336345927f20ad7040789f9a621a77011963dc38d33e72b5fd873909ce673fedd68a0a23848d09d99ada2ae7a802ef0c SHA512 72b178ebfbbd39848ad2da730f273ad5c30a6b21fbdb8806b1d85c6b150c34751d19b240989db0004a4d5bb2d1155b42b06942185efcf52f9cf05549c253926e
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
index 970e090f0dfd..a471f28c8a3c 100644
--- a/dev-ml/opam-state/metadata.xml
+++ b/dev-ml/opam-state/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam-state/opam-state-2.0.7.ebuild b/dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
similarity index 88%
rename from dev-ml/opam-state/opam-state-2.0.7.ebuild
rename to dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
index a0a6b6eda7c1..6a79137fcca9 100644
--- a/dev-ml/opam-state/opam-state-2.0.7.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/opam-repository:=
-		dev-ml/re:=
+	~dev-ml/opam-repository-${PV}:=
+	dev-ml/re:=
 	dev-ml/opam-file-format:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
new file mode 100644
index 000000000000..32d7d0ee0cc4
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	~dev-ml/opam-repository-${PV}:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 1f0979ce8c83..b7fc20242667 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,6 +1,8 @@
 AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4
 DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
 DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
+DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 EBUILD opam-1.3.1-r1.ebuild 1099 BLAKE2B 95092c1bc70a559f6274c066310c068ca1a0d17a77181c9adad18bac5907d2b396850f6d8a141f11542b066c076a295b03cab367b802a623a83c86d6d9f0375c SHA512 46b3072db3b5fcbb32354caefae0f918733795594308591c0cdab47c2908e15c897ac09de0c810ceea2682e0e3065ead78942d105bda4a8b8b9e12d371db85af
-EBUILD opam-2.0.7.ebuild 795 BLAKE2B 2e176770e5172388b6d93e97757396874734b1ff0a5ea167b071c66cec4334589ab441db1bde9bed434397b09c6517d52c19f97b324cc1537b7b8624fe2b9845 SHA512 745467a937dc4323df6572f8413d5c422c156af2f8f742e4b40194a87dee3a746209a785f24ce4c619531f70256744e566d88780f5fee50dedeac344d2ef1132
-MISC metadata.xml 319 BLAKE2B f3a6de363afedd8ecf6d5cd898b0ecc0c7da67070f8929f39f6e5395303505e9b2679cd32ba4445f155aa522bc09f5c6bdb09a3941f679c5eb1ff757040f0d40 SHA512 c251d0c83e251b9f20f83be5d67381c562400dc1567a4d3a32b396c309dc669b03f1d7e25e4d953c155d41aeaad07d47a67a2c602855cd45d5c9bb749dfa3b3f
+EBUILD opam-2.0.7-r1.ebuild 802 BLAKE2B 29ca25f720a229a6b41766e4eada93cbaf784859720dec4e23ce1ebfb7b27d3cc7c9124e70307a66f65b0748cdfdcfe31ab8b72f51fd62bd0acfb229a34dd6f7 SHA512 11e8e159101e32350aee72f5f14c4d8f213b722131f76bc1faccffdfdb1d2c363154dd9c5fa85fd4988fee3adbfbd54396d007880a630aae6f52a7a868c777e6
+EBUILD opam-2.0.8-r1.ebuild 802 BLAKE2B 3b6c15387b50806e20d55257d50809892aae78ed053313789c0a9d323405e2101febdddc6f4c6e0661bfdcb7ba750b2b9c4546ca2f13bd7263989b54d9b98bb7 SHA512 5986c5234c62e038f570174b8c6914087a3f76dd5af05aaa18a6e849167c8f2391259834bbc3dff332d8b47b5d6f3e572c54d25765fe859699e822e74b91660d
+MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index 970e090f0dfd..856df00497e6 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/opam/opam-2.0.7.ebuild b/dev-ml/opam/opam-2.0.7-r1.ebuild
similarity index 91%
rename from dev-ml/opam/opam-2.0.7.ebuild
rename to dev-ml/opam/opam-2.0.7-r1.ebuild
index 61db05b45f54..765c723d6f11 100644
--- a/dev-ml/opam/opam-2.0.7.ebuild
+++ b/dev-ml/opam/opam-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-ml/cudf:=
 	dev-ml/dose3:=
 	dev-ml/extlib:=
-	dev-ml/opam-client:=
+	~dev-ml/opam-client-${PV}:=
 	dev-ml/opam-file-format:=
 	dev-ml/re:="
 
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..acd71e6b4ecb
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	dev-ml/dose3:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fa9f814ae2ba..bdfdc6a24528 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/SGMLSpm/Manifest b/dev-perl/SGMLSpm/Manifest
index 44e6c5ab6246..9f6229a2a251 100644
--- a/dev-perl/SGMLSpm/Manifest
+++ b/dev-perl/SGMLSpm/Manifest
@@ -1,3 +1,3 @@
 DIST SGMLSpm-1.1.tar.gz 114100 BLAKE2B eef93b64f7fcded73bee0e169e417853d84e2f446d569906f752a87ddd1edcb40c63dde3a50d4e4d7840e8c296d9ff20eed5c316bbd528adef16a1d85a38f0d2 SHA512 0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc
-EBUILD SGMLSpm-1.1-r1.ebuild 532 BLAKE2B ef29ba28f3031af74d28206323b34966f7399b878580df8f3283a17aac1d0e95e28b052e9de97ce01d9110cff88898044f63596917828f521954de4b8059aa80 SHA512 90c61e03bf68a964219e077ed8504d7a2a1f7663c2731b3edd033e70e4e46721d5cc5df5668348581bb670abc37e2a83ce6638a8cecc280e7fe5bab3284a75f3
+EBUILD SGMLSpm-1.1-r1.ebuild 549 BLAKE2B 35e9872b0173377abe7ab746e1b7464ffe5bfdc39eb3ee2b4731b54e354fd3daf61524a22c607fc2a86292545572100902165476190c809347863998e6d719a0 SHA512 e23a942661f7b4f27b31f1f2f0ec730d8445306cebe90b49ed9c195f2289eb1e221f44634ef11954c42ca5d0ec7990b015b4a79bcaad8a4ad6857499879ede05
 MISC metadata.xml 801 BLAKE2B 89d9fae1e95fae3f561735f49d0383950669702a88dbba4847bbdc633edfb44d3025fbc79c932150bedd007764a83a8908ab65baee0971d4efc5ea1f58aeb6df SHA512 4b714f8c595c2276548599d642fd02df763044c09e1abd6097588859764701fec6ce9abd0a9798db573d71cc703293dedf462ade1b8b6d5b96faa9b8ee593756
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index 2c57f7ce15d1..c2b72c2812e9 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl library for parsing the output of nsgmls"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/Text-CharWidth/Manifest b/dev-perl/Text-CharWidth/Manifest
index 07ef31fff0fb..3c296e00c89e 100644
--- a/dev-perl/Text-CharWidth/Manifest
+++ b/dev-perl/Text-CharWidth/Manifest
@@ -1,3 +1,3 @@
 DIST Text-CharWidth-0.04.tar.gz 8387 BLAKE2B 6d7a75c9a010c6f909a7d34a23d58973afa1b6a53091aaf0cd7ff1fd1f38b87fe2e043498871ecd2ccd3634baeaa03ca4ce0bceb04736e942bd3bca94e17359e SHA512 8ec7898fcd4a3bb6e9e36fbd50c28e023298f830fce33dafd1445de97732b337d3a6f9a075059a56592d0f118ba83c45e61fa4fd4a6d3bfbb2cd25215a061e1c
-EBUILD Text-CharWidth-0.40.0-r1.ebuild 453 BLAKE2B d6162a23ad4c8ce69a602aa4e3251d84c4eb602fded0e2b6d0360e87591cc4ac29e4526b9d06a3b3f6e2da6dcf8eef105035fefa5127aeb0b3b9f779aee91b69 SHA512 99847a2e518949edbde0e9a0794bbd93a8cde0c24d00391b2d543d7f7458992962cd7043339b72b234daffc1361aa85b39262b0665199c351fe8cb28ef8131db
+EBUILD Text-CharWidth-0.40.0-r1.ebuild 470 BLAKE2B eab4924f49df97bcebc2fa50e09c1e9ce2f0faf9ef1392f9c08c97060826d2e9ce514ea3ad582c3f823d218e21838d80f46d08f3f94a24672f47018a956e90f5 SHA512 b73d0b083f65b2b8407a1ad6c8ebb6e4523fc927a98a55b349037b93adee36add941b4f92d547f3c2f1bd7d839f0f2002d766cee55b334abbba8689a42d5322d
 MISC metadata.xml 400 BLAKE2B 94cc58a7229eff59f4621c9b3c9bc9d90aa55ed66dfc6259b828f5846ef3ce0854026292c6d0c6acacf80da9494733a311bef955146cc21f9536347b78a5cb7d SHA512 9df4dbe1befbc2095aef448e21fede21930bcb5474c7221045471e959dfcd1de9001b24d6c6fddd9fd8b0621cd637dc4cdb8917f219a077d106cebe52cd7073d
diff --git a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
index 55afc9a43310..9788f5b57182 100644
--- a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
+++ b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get number of occupied columns of a string on terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Text-WrapI18N/Manifest b/dev-perl/Text-WrapI18N/Manifest
index 7f319596941d..8b30d0ce7a5b 100644
--- a/dev-perl/Text-WrapI18N/Manifest
+++ b/dev-perl/Text-WrapI18N/Manifest
@@ -1,3 +1,3 @@
 DIST Text-WrapI18N-0.06.tar.gz 3812 BLAKE2B 9e85b6afb81dfd5b568722986613150b3cd913ab9efee5907be08f57464b6a58ba58051695e933c7584d9849ab83e659f9814dd48719b6f7b91df08936ae7c36 SHA512 14ff46154f198ae743f1bf354d6bb020968b1e3c3996e882c871e0a0067ad1d6b50911e69aec31380200d64bc4ab46ca1829cce1206ad43406fab89fa7e6c0af
-EBUILD Text-WrapI18N-0.60.0-r1.ebuild 496 BLAKE2B 03d2bd5e07fc2271db12cc23a18c42b1cb97e305fd3d46c7427dd5cc3a343cb055c13b9932137987b2827d4280f44d837e8f533c889d00e062435ad750cb85f0 SHA512 5433c384db3b4d532bab610518db291c324726aaf0cfc717d2ba24e4fb6dfaa014dc47f225c5068bbd6f0112554a3b11eca2d19e32b5854af6b955cf50c94d7f
+EBUILD Text-WrapI18N-0.60.0-r1.ebuild 513 BLAKE2B 166c00ddb50f950f16aaf57f7be910143d90ff93d2a08c4ea112edf6ebc9ec0bc9d79afc52ccb9f00559f29d02d0088d241d3e2110b6ae3a04e8a45b734e597e SHA512 dbf8140af5b5bf220b419287c3d530fc5fdbf0c1b0c56078846fde30cf62d648210ab82927b6fcfb1b7520f18297e4cd7b902dbb956bee3dc2c3fcdfe071cae5
 MISC metadata.xml 398 BLAKE2B e326cc4f2d50d8a998aa8dc10513ae0bcae46f8631a4e5533448d8efd0863617183b8d0f52dfbc0a77ce47c0eaf44ad240367fc0d64c6f8a45c0611bb0af984c SHA512 bbd38546e5ec5579855fef2089a589b0d00636774244cd1b9a3b7ff5b4b139bd5df3acddd2ab12d6d4b9bfb26298ce3e14b57b3327e0b3086fc05b3d0d4e9021
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
index a31121f50186..94b0812288b1 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Internationalized substitute of Text::Wrap"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Text-CharWidth"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2b4d86582de9..ecda77b67425 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index aaf53b04f296..742c89af0205 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,5 +1,7 @@
 DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13
 DIST bracex-2.1.0.tar.gz 25148 BLAKE2B bf0c2b60713bc17dd40b9617bc8066e44b5654bd1a12948109a496588050efdf6a31d5e1d31a587cd08da9033520c2f4e0db89a806acd628f7455b6a34a03c2d SHA512 ec1deeb466cf456ca3ab93ecd429b23f59fbac74215cd0de6c447f67be2bc40552dc7ba71331771d765804a190cdbf17eb7c255e976c1fef2f7e47d3351dfdce
+DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
 EBUILD bracex-2.0.1.ebuild 1047 BLAKE2B 6e95538bd6fb2c2ef5975dd6de844e52fd792b829d8e3971444a13b8a31a22cacba982220625c6c04a21de88fb81b3fce819689d7e6f4d40ddea893a5bcfe7ba SHA512 16e52304611f7eca1b4ed555b6239fac7ccce63f510a600e3c64cce15bb86735ce2cc37517022d5443b2d0f3fb05340580d43d708862ec0b87d36dc390f6fd5f
 EBUILD bracex-2.1.0.ebuild 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
+EBUILD bracex-2.1.1.ebuild 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
 MISC metadata.xml 1198 BLAKE2B 0fd219ffba7d698f8dfc8bfb131e2baad454e2cdea289d8cf0875bdad2cb818d47596af1f47f98c0e1861ef1097e877425fbc15014b5711447747c63511d2e9e SHA512 3ee15cdfed6e6a8cc0304fcac06b1448e413a4d6e7205a1164297f2343cf38672fd3bad03436554e631be757b6026a678bf071af07c86b74dde9ae23df3ae23f
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
new file mode 100644
index 000000000000..0af93ef28dda
--- /dev/null
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex
+	https://pypi.org/project/bracex
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 1cfd3a365cc8..cc847347e81a 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -5,5 +5,5 @@ DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621
 EBUILD construct-2.10.56.ebuild 954 BLAKE2B 7edbb7e6e3102ce1b903831ce6e1f2274b4a3bba5a78c81daaca7154d418f9e02fc4ca76f0676bdf1e9ef616469cc75905f39bd0374c5c5458e5abab2a54af8b SHA512 2442c5b42ddd82ae4f673e2468af82ae397729eb8684c5ce48b37643e86743b4d79ed61f457d9afda8e007eedceb40546bc4783eae75bfa0dc73b4ec8d9c1763
 EBUILD construct-2.10.57.ebuild 972 BLAKE2B 14fe5688c8136aa27af5780ddf171896a1f02a846934d72e373fff00ffdf2bd9ad96553f3d147eb2c475f19da243ca634646dd76385e85ee6156d1c433a2d13f SHA512 6192b931155be5711a2d838616d91e40d44d4e3c8e6203669bed06b2a95047074890b08f2e89ff15b70acc85bdb07ac94082c0cd9411cc1e2b1fb35140ec4d27
 EBUILD construct-2.10.58.ebuild 972 BLAKE2B 14fe5688c8136aa27af5780ddf171896a1f02a846934d72e373fff00ffdf2bd9ad96553f3d147eb2c475f19da243ca634646dd76385e85ee6156d1c433a2d13f SHA512 6192b931155be5711a2d838616d91e40d44d4e3c8e6203669bed06b2a95047074890b08f2e89ff15b70acc85bdb07ac94082c0cd9411cc1e2b1fb35140ec4d27
-EBUILD construct-2.10.59.ebuild 972 BLAKE2B 14fe5688c8136aa27af5780ddf171896a1f02a846934d72e373fff00ffdf2bd9ad96553f3d147eb2c475f19da243ca634646dd76385e85ee6156d1c433a2d13f SHA512 6192b931155be5711a2d838616d91e40d44d4e3c8e6203669bed06b2a95047074890b08f2e89ff15b70acc85bdb07ac94082c0cd9411cc1e2b1fb35140ec4d27
+EBUILD construct-2.10.59.ebuild 1015 BLAKE2B 8e32535cf7d7b191659d8a526ffc8d1a95d8560fe2ba5c45bf3030a03e0813ee69f450a8cd641c3cb3a208f326ec90d5c46d4c2373d6c587ef32cd1a4361c918 SHA512 cd9992730f698d77c4ae101337fe77d7845e140ac0f9d53f19db386feaef3f2cc24f1af49bc4c9bb05d013791adbb03e30efb60da76560a4d620f5ace1be7768
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.10.59.ebuild b/dev-python/construct/construct-2.10.59.ebuild
index e67bd28cd5e1..09b4e4cc3146 100644
--- a/dev-python/construct/construct-2.10.59.ebuild
+++ b/dev-python/construct/construct-2.10.59.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index e753e94df288..c3f313ee2e25 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -6,5 +6,5 @@ DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 EBUILD cryptography-3.2.1.ebuild 1939 BLAKE2B 864e5132848b955c862df3540b3358ead1d91a98807e7270eec064e19d5c99ad66eed9aa1d971751b5552da9f2f5db0d8da5a23894d0cc84051dfc1074e13fce SHA512 0a4452744993e5db8210dcdb0a9913113c26b276972e703e905e49de2d2dd0d03af094624b9e5338dc1faeec798cb8e2554d41edd0729f3502deaea4ae5ff598
 EBUILD cryptography-3.3.1.ebuild 1941 BLAKE2B b02de77b6a7a9cd982859e899acc43da80a5a877effaa7e4db7107ea09a56c919989a67017330582c6b0a891ef829e4846728f05f30b220c3355ba4a14802144 SHA512 7465483567f1306457cdc1d468e886d553fecefa10fe79e3bdb95d960f4a444a49b3ad099cb06988828c98dc594506bcd5041e3c34d75f9210a3368904ff9e40
-EBUILD cryptography-3.3.2.ebuild 1948 BLAKE2B 66a938f2b121ba0ba4bf0becc1846209fcf28bdf7255c17873d7e829faccb11164593ea916206418a3dd67e932c1606c647039650a0d9b7e1969604fb5caeb8f SHA512 79282e1a7347008d10ae8710cbc79d23e7373848d4926ea0f3d4c80d69b7c5270ccf44a9cb4727d5b900666e898dc4b2b59ef4711ec39fe45845fab81dfb9bd5
+EBUILD cryptography-3.3.2.ebuild 1947 BLAKE2B a74fae53a3aa6f0788a685c731c4b51a8d0cd4b4a81cd0de6a54c4447cefacf9ba62920978d3396f7c52c10937974d2e6973c425711cde0431a67a233ed1de56 SHA512 6087aa71d6fd587d7da1dc7f6e1af249c35cb09121a3c6789c50efed0594214b9322021cf1ad0f90b0126cfc07eb0d60a27342ce2aacad4149fd6d85cf4d8dbb
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.3.2.ebuild b/dev-python/cryptography/cryptography-3.3.2.ebuild
index 3eba1c50b6fa..ed68adabc837 100644
--- a/dev-python/cryptography/cryptography-3.3.2.ebuild
+++ b/dev-python/cryptography/cryptography-3.3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 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 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index dd37a07019e9..15001883d8bd 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -2,8 +2,10 @@ DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51
 DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
 DIST jsonpickle-1.5.1.tar.gz 109560 BLAKE2B 07dd2a469f0bf6fe531d34b5f2d731c6aca863899ce804f44c14b38f93b8c8213b1bf4fc4cc19dc26dcb40d71bfded1115060e54570742afd393bd0d63f12d2d SHA512 ee3694e961bfbb6cc985691fb4821cf831dd6a2cbbdc8c6d1ba8e43fe7a4bba3d4b6868a02f76b88d9b036cebf51b217171504a6647f26b0e2d11727baee62f3
 DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
+DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
 EBUILD jsonpickle-1.4.2.ebuild 1441 BLAKE2B ef8bfc14c6235e351bfe23125149b85c4b4ed261d971742545b2a36136637910975f74b063830784d032e2217e5ed59544a9a8803f75da61ef0681696e09dbe6 SHA512 fab8686bd27f0159b00beec66e3cf27e8deb4eea25a6a94ff67c61e90b90993e83dcf48bea3eb178e3654a628e851cc6d706941361a1a709ee3470bfe3dcc5e6
 EBUILD jsonpickle-1.5.0.ebuild 1443 BLAKE2B dd91fb08e3b02a0d3985ed2def4a62ce5eb1cadcef87c84b17f96aed887073c7eed8075bf4940dfdc19dc93f5bec4bd3025f178d72374b5a050786ed9a09b0a0 SHA512 806f4021ef0c33e45b6a0e795a333e379e3866e444cba63d50f7d6439726b5468755ed652fd1d2d485e3296cde8ee33cb6e7793044a9b53254bb3726a119a06f
 EBUILD jsonpickle-1.5.1.ebuild 1351 BLAKE2B e9d71e869e66e574b11fbcb6e2a8c4cf84c1ace6cb3943d9c3d8a40e26fdc4687f75e49a760aefb416017ea93ec831fbbacf2874bea5b84131a21b49ca74ac96 SHA512 7f1c16287447b4fb4224260124f7a1f74b4757cef90d459f9046d20075a6a17035eb8663c3ac9d7db9279eb3a2936ae639fed0986cc5a7f2044c1b3d60743b31
 EBUILD jsonpickle-1.5.2.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
+EBUILD jsonpickle-2.0.0.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
new file mode 100644
index 000000000000..cfb3bc401537
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.
+RDEPEND="
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+# toml via setuptools_scm[toml]
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx "docs/source"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# too many dependencies
+	rm tests/pandas_test.py || die
+	# broken with gmpy
+	rm tests/ecdsa_test.py || die
+
+	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index 81f2214db043..a86b65b16db6 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,5 +1,5 @@
 DIST lmfit-1.0.1.tar.gz 258368 BLAKE2B bd2956cb9519f9303d0d2707b0333839ce471f62f53c907870bb6b8ab867cbcd1581d82a1959a6c3c734bd6b8074a769f0587706b3172800cbdef979db3a148d SHA512 1ae3e2cb25625a9b24c261d81c8f1ba0389266724581762f6e0a96140c84e43acd527ab1b83b862bf7b3b4c0b1b9755ee38d0c52e63fe89ea41f2d010b1e5c0d
 DIST lmfit-1.0.2.tar.gz 306039 BLAKE2B ab5fcda566f81f00a9d2371f6ae5b3477ed015c70e9b9faf8c5228e3f75f0bf9085d9bd3789042af7b46813d0b6c88f96da37ce295593a5368144d53f5f1799b SHA512 85adeac989117dab3cc9aaf216c37ea5087452351a7978238929216dd9d9be8b6b6790103d4fbbf5211a943c43fb99461750cf58287e2b18c27f66eeacc6ed9a
 EBUILD lmfit-1.0.1.ebuild 678 BLAKE2B 00266788712b2d091ba644bbcaeb473af9efc15ecb5a971c67ea41b064930773aa9cb51a9c75e449c81e89524194581181d17d3b55102482b74046d74b3524f9 SHA512 cbae185cd4b398b124c4f69275f4bd48964b8a4f49d626d62f6ca51a65dd2316138b272f7a15d714184ccb089422d2434409f522e150a133acf365934f4d2662
-EBUILD lmfit-1.0.2.ebuild 938 BLAKE2B 9e9b4008a4828982c9b97a574fa75a9ef25a5030055471cd68376a8e00272d7cc33317191ade70872427297ef782b77a2c5a6bc531a2db773949fc289bd0eb5a SHA512 4ef1720dac5c56eb03c0c6c6f58a76b9bf119d2822947374295353df8229756371495d3dccd415cb288c8336172ba8d938347ba921db017d77c6304025e0e2d3
-MISC metadata.xml 284 BLAKE2B e4fdd5384c149d5805aa66db2ee08b98575d7a49c303879a347a7b43f2dcc938f05c228ab68586988ee226e49fc7babdbf7ef6295dcd59b5d9ad78761b750f4e SHA512 33ba33822f91ac037549650f0d044528dbb694d74bf229b6aa5a1f4fcac552affb3ed2860b8279dca83c6ed8bc1ad7193513450b91ec0f8d10a4d1ee12aa3196
+EBUILD lmfit-1.0.2.ebuild 1056 BLAKE2B ed874fe8d63dbf9e1c649770e6247c61869ddd7326af41d5c1366ba1e23072d5d17eb27f91606ece5bf4337b119b33a667db2469945c1ef4c85b4137a7a2810e SHA512 f197479a8b159a215f38ec933cca2018b4f8a2fbda3ad7df5f6239d3566f7c9379bb1b1279ef478e4c9a12324c26c1a44ffae049e3fd51126720c85b64f44bfd
+MISC metadata.xml 385 BLAKE2B f0e9be81d998336366945f8ed722ff49a2868ac446b12659241e3d2bc64e3e918a4917b8212ff2a2a7264a92ae460df98295a158ee90c8cd3a6180cdd1f5e9c3 SHA512 c1354b1220795403aa9576da5b30e7c8f2b3836d847c0e05f2e7465927209ec4ff0675d0a1853508dbd3bf41880989fa151520531e5d6612be27a13a99a22bba
diff --git a/dev-python/lmfit/lmfit-1.0.2.ebuild b/dev-python/lmfit/lmfit-1.0.2.ebuild
index 3be5d42ef10e..3e93970d9753 100644
--- a/dev-python/lmfit/lmfit-1.0.2.ebuild
+++ b/dev-python/lmfit/lmfit-1.0.2.ebuild
@@ -20,6 +20,10 @@ RDEPEND="
 	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
 "
+# past from future needed for tests, bug #737978
+BDEPEND="${RDEPEND}
+	test? ( dev-python/future[${PYTHON_USEDEP}] )
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/lmfit/metadata.xml b/dev-python/lmfit/metadata.xml
index 3b1d3048e0a5..a5898904e259 100644
--- a/dev-python/lmfit/metadata.xml
+++ b/dev-python/lmfit/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">lmfit</remote-id>
 	</upstream>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 634f2ab8a052..d2b299290560 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index d007e5685216..20c7af78b1a6 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,6 +1,6 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
 EBUILD nokogiri-1.10.10.ebuild 2713 BLAKE2B 57dedd5488570432b5202d72ea9427ce220fa3303f4899ec04802969cef5e2b151fd0f97f6fdb912f5fb1ad876ebc5c4a66f0b84e7cc2eee573d4ce24da217a6 SHA512 fa8c7d4e2dc79676837763c9b114fa9d4fc53b387dc94293fde7902b3506d99fca95ea7c8699caa284a8eb8b49bb46bc7a8e6e8d6b7eef32caeeac1ced927b2f
-EBUILD nokogiri-1.11.1-r1.ebuild 2890 BLAKE2B 743f0897e421a45ea046446afd81da14c5c4c939eabefeafab89c9c4eb6f6f1c2407c22cd023237701eafaf31f5198db1c4cb5ab202dc0ba4a3b98fd49c209b2 SHA512 76b0679e7c0a856f47891128e4473a0f0c3d1f3253db88900cdcd2eb03385479530bec1476f072c6173ab6ad531566500867f3c662b7b9acc03d4903116ab7ab
+EBUILD nokogiri-1.11.1-r1.ebuild 2888 BLAKE2B b717edfb5f1274e488a957452fedf7b17d33d5d5d01a1d3c0da2f620cca6f446b570a8c31a4e5cd2d8ce89f989def7e1e3dd00637ecd016d33bf6b3c7d35a037 SHA512 85a133dff342f3db6d85b24414f5adc769c9778765c248084b14dfbfbead177df9adbcab7637bbd058526b20e37b0fb0e29efdebaa14561e65b4b4029a39c616
 EBUILD nokogiri-1.11.1-r2.ebuild 2941 BLAKE2B 706ef2bbe6dbfe420479372e5e47fbee24486346cd6a5219eff21c21d6d3bb9dceeec8e94c06b3f9bce701321f222d1e19c7de0cf0612a5f8f77c1fdf84a16d5 SHA512 80d0038279ba7d0f324a654b4cc0c95dd748c0983aa855a9bb5c09e07b351a0530736e9f15814f28d32f8d30695085e408d519348f9569b9b9fb138d266313f5
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index 25405d872c2f..d539bf8b2022 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ce875f09b688..456bbfa73a30 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index c00dc525ce0d..a4f41b35b9a6 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
-EBUILD goland-2020.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
+DIST goland-2020.3.2.tar.gz 484904300 BLAKE2B a60825d0b994cb16b9a41fe228787e0dba541f34e613cc88b040b2b80d044a9b45a69fb1346ba2a919241cc5497b5cc398b571344a790d173dbb60333d536b19 SHA512 2ea02dbc8ba0338ec73cd35c6eb0a70f5f6b6487d7d58629ee1e454ca5b22b233dd5fb28be64e5131be291a4153910b6ed2ddadeb1f8f4ac1ce2f63b22c6b233
+EBUILD goland-2020.3.2.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2020.3.ebuild b/dev-util/goland/goland-2020.3.2.ebuild
similarity index 95%
rename from dev-util/goland/goland-2020.3.ebuild
rename to dev-util/goland/goland-2020.3.2.ebuild
index d487b813e0a4..86cbae508305 100644
--- a/dev-util/goland/goland-2020.3.ebuild
+++ b/dev-util/goland/goland-2020.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ src_install() {
 
 	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
 	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+	make_desktop_entry "${PN}" "goland" "${PN}" "Development;IDE;"
 }
 
 pkg_postinst() {
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 157de451122f..f8e0d1d133de 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -4,6 +4,6 @@ DIST pkgcheck-0.8.1.tar.gz 455289 BLAKE2B 5e0999c4348e4707e917b511718d378bd7cbb3
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1.ebuild 1327 BLAKE2B 47a73af7256210687f4ede5bb41d08541ff50690c63c5f8ccf8f891693504f2ca0c7d5cd32ae91002852bc0b72c41a472925573ce9236b3f8c6fcee788c2ac9a SHA512 1fce4e63315c148a43813cbc3e18d3d90ac6cd9c97085980a0e471e48422125f14e7061e40192997e249ff230930218bafe2490aa7e2231da11d21ff9666b70d
+EBUILD pkgcheck-0.8.1.ebuild 1333 BLAKE2B ad76771e021b1a03d04d894595e3f5b25c56ff581232be0456b4aca31addf30c8e92c05716e60bcab898c5c7a536b1a9c495682d64960399da120ddb9a3459fe SHA512 24744918a0f103ac3b0d3df720c2046df5066b302eb9016bc0e6ff0834a85415e561a6f1fdc7d98f9982c66ada2e3814484072f00280b115892240d16dc04fac
 EBUILD pkgcheck-9999.ebuild 1376 BLAKE2B e2cd0778b9aafc67fa5ed33ebbfc68fb6f6fb3ce34162864d7dc303f9bf55acccfb15bac0e9e88d3e91fdb8349e00c0a3648a0326eeb87f96625612570eac136 SHA512 72d2401d706c3833f378a485a8e8c0a95859c111695d05dd421ed61411063a4aec095e10974f60e5f03b8cff1a1e56303b922d7ebc87258c5ac2ecdcfada6654
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
index 4aefe73dcd97..a768d08fe5a5 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 43baa91c18ed..b10b11b3c3bb 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 732cd9e8842b..a64e98f50e15 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,3 @@
 DIST libwpe-1.8.0.tar.xz 51260 BLAKE2B d5f5249e3fffba03a0e87e6a8b2a261e426dc25c2a57d5e060d81f7618e957884c1c74a86a79216d4e5e85f9e173e7629be9c6a674898b20e701fd59d487bd32 SHA512 38b02d97f9ee40a1bb345ba0766acd1852500c704447bde224ac79f41e91abc06fb3047119f9843a11c78cdd5899287ab86ccedbcaefb51e366a1810f2f42fa8
-EBUILD libwpe-1.8.0.ebuild 579 BLAKE2B c45bbab88c62dcc3d07c0ba9cc294b2156f7aef9d19b2899c3003b0e1104fd8aa4917e114c86425c404498527dc47d7b2f75f5f1a28f9b7a21e83d9c3009f090 SHA512 aca65332f9a002e9da94b21da16439d529200adf6afb3a5f8dbd8f5007df8a6338826a9feb0c4212f5b5f34a3afdf35d36eb1f4034e3b19e44573058f422d018
+EBUILD libwpe-1.8.0.ebuild 578 BLAKE2B 02f5854326a78a43559883731c4f0756fe3d33c5ab06dc646ab39a43b1b87e9ebda544622d17430dd20c6eddf40366252f0f099eac383ace236401cb4181319a SHA512 b9e8cba85bf9febfc58810f1501121715638d3f404f1cf5ad1050908cf8baf3e472954566678115c917131b9784ab624874b75e72f5072fcbdec4339313898ac
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.8.0.ebuild b/gui-libs/libwpe/libwpe-1.8.0.ebuild
index 4394cfb0a82b..989e6d4828af 100644
--- a/gui-libs/libwpe/libwpe-1.8.0.ebuild
+++ b/gui-libs/libwpe/libwpe-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index fb4827b7cd90..62583c619b96 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,3 @@
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
-EBUILD wpebackend-fdo-1.8.0.ebuild 635 BLAKE2B 64d60a47c52a1b3ce92db12658f5514199612825839543fea55cf406e20466e1f6dd2bc902d7f444409a90d7f26ee462d672a3f132b92c571330cd995df72c75 SHA512 9f5191147af77e25591d027461bcfd6de44d97750ab993919cf82efb0febf7a7ccb3f41b25ea019dd64a8f9fe4f43347f2b5e8258eb9de9e1a8e1b3410a51616
+EBUILD wpebackend-fdo-1.8.0.ebuild 634 BLAKE2B a047c20e6f34d3b3d22c705b03b7e39e9783d6960998e5b945ab5fdf53a56017cb4f2e70797de27aa1c63233951ded0f7de89517d0121223d3fa6d5673537a98 SHA512 cb410716a72123d7e64dc1852970c8aec1e2fcfa42f5b6096d6aa8bf5835bab434224f840cc33d58dfd574ca6f884913b3164dbe6faebe0babecb21ad14834b3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
index 7ac3f00cdb61..4e9149712be5 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 57484e23ed45..df468627856d 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index ea8f42c792b3..222631ca8abb 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,7 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 DIST claws-mail-3.17.7.tar.xz 6447268 BLAKE2B 432e36e5a376622508eed2e4ba7fbc885df66b05b7f91386f8bb3cb1f96980b946362fad55848f1c0534bc079981d7e4d894ebf62d6ecaa9c60cfde709927a75 SHA512 b8089b0454c8e91a2e1fac8829e44ab01faa049f899252eb226e0b4998be4136334bba3d3efc5baff90e23e027ad928162950b4c986504d918dc628fcf9fa2ff
 DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e19b6658d1970e6ec8f41e97e37063d3823f4aaae3ffcd855bd2839b7feb3a4bca0c15595fce2968de2418758f4fc50c SHA512 dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
-EBUILD claws-mail-3.17.7.ebuild 5815 BLAKE2B cff994addd5595f0c88fa9ae724b4ee53618711f61b97940aedf81b3fa384aaf93976a831428e945037135c0c66f56291f69eef0db40676b652398c88a96bb95 SHA512 2653f9d4cd7e8766a8c7da68be486ca3898212f4b66015795ee257076d893d058232c2d58d30b2096f0e104a49b0c622e305b73f30232eb494d306e0b22e8726
+EBUILD claws-mail-3.17.7.ebuild 5814 BLAKE2B da654a4c10befe2286306b6f84a70bd73c0002b8631c815ae78748966d69d3d4b3b33f014d635aa2005d1f290933a302e039327d25e939f1ee0aac4d88e6c5ea SHA512 4e966bdcca53a08f24cc7556ef2a00dcc0ff0dc4a7a8938a8731c7b0d6a748900d83f4d7d828dafd9aaf66a17a30133c8cc2ec2db76110aecf79b92d793c4609
 EBUILD claws-mail-3.17.8.ebuild 5825 BLAKE2B dbff2e83176350505756b91fba1c92fcb14511291cadd63a78868120fc23f41564caae2df6c3e26adffde582186dba2e4c510dabfd56817cafaa5182c7ea2099 SHA512 6a4f55f8ca6205a27650e3696b084f8ff56a3606ab22f710f16c0db8be55416312b2c2f42684d2972cb36947be2efa200eeefe9a25ffed29d15278cc9fcf2add
 EBUILD claws-mail-9999.ebuild 5962 BLAKE2B 770f6e6afd334f616bb46b04868d797bfeb45e1ffb6b5f82067959e31b2661c87e85cc0bce855a165f383975c5050e7539b256576bd72bb9dfbc11970bca96d5 SHA512 8792faf220af90d010715a9971d54b82c6b08c2a5c2d105f34aed9c14620965f684b4350ff975554611f0f505f03f313d08db20f67b17544448c8e1d4302fa53
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.17.7.ebuild b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
index de61722d5e59..c8325c1ae988 100644
--- a/mail-client/claws-mail/claws-mail-3.17.7.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f804bf54045c..f85c0685424a 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c4a85fa35020..ba942ab9cbd2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -8,11 +8,13 @@ DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
+DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
 EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
 EBUILD darktable-3.4.0-r1.ebuild 4584 BLAKE2B a5a88c6d232a309f7b900f76d9736102a7863fed509db5534feef5e66b778195d2bd225ebaec4ab447971ea10a7996c08d727dcbfc3dcb0cac4a7e2f4f0b7da3 SHA512 b9bf993563d4ea36113ebaf911d5b49c55458a6e521b0bf479523d37652d372e290d44451cb30969bc916e30eef1375b64c2e0ad70ea69c8a7be926f56601de3
+EBUILD darktable-3.4.1.ebuild 4475 BLAKE2B 014357ed56681c237b4ed9dc2c2070613298c858a3d996fcf763db981411f6cf7ffdc84ac44fcf5cfa9070af991409e608e742357c476cf387502764c40291bd SHA512 c0e9dee7f87d2d9a6e44406573b7ea0f7ab6dab096adfc1ad6b8edaf55bd5897bde6df086dfa235cbaef0eeed3afbed4cd5170dfa762af8336af19bf20efdc12
 EBUILD darktable-9999.ebuild 4475 BLAKE2B 3afed84176b49c7604c36fc5605a75f7db9bbe0fbde3a438dc964010a184b70031565b4f20914315c934c9d8d1f4e24d2f12e05d8e20a7498a972bb83a2d1ec9 SHA512 5294cb5cf18fe9be1d6b43553ab46759925dbb904c0b0a5fca9349a9b860d6756cb834eb4aa493f0b831a49554387898d5107191f92f05d9f03f35989cae0dd6
 MISC metadata.xml 1296 BLAKE2B 41415c7a013551a7e5cec72b8df9304b446d273f80b1975dd5f15672ec128f20e1b6d94be67d2e8e049674e1f12fae0d85840bd9aced2b62b213fe519b85f80d SHA512 110b05e5c449e0e1bb9fc0228a4b762e2f2fee74215ba0b084d9f719481af682d2a70c8df04313eb89916051f2c3ba1e057321b839144ad70298faf90605acd7
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
new file mode 100644
index 000000000000..c66c363f4918
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	DOC_PV="3.4.0"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+	KEYWORDS="~amd64 ~arm64"
+	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )
+"
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2 )
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gmic? ( media-gfx/gmic )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=$(usex gmic)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 47a169965a00..c5e19882e4f5 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
+DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
 EBUILD gmic-2.9.4.ebuild 4846 BLAKE2B 1b70a21c2004aba565a4e81372930200a373c9985dc47f7a3c23a8cc076bc11c4bc565ebe356384dfcbe94db60c5f568f75c772f4dcb3a885d7b39318309e36b SHA512 bc6dbdb81baef52096e0afe4cec2df0161b227a75a6dac150d07f2b8e37e2d09856b046a9c670db2818eb538b046be21f7eb30512c9b74909c3bdde3d1c09b83
+EBUILD gmic-2.9.5.ebuild 4812 BLAKE2B b28c92d820950c605f55ede12bb676e95b23b1fb0dcedae6f3b742ec08a1278548c7698df0cd1baafadda256ca07cb8e241db0658023124aaa5670dd43f479c8 SHA512 9edcaf09cb7f90f6bae3131590ed78d86b992548b7a934f7fe8fe47ac9b1c7ecfb0153eb8dfe5944e2b2ed53650f34ec78e00763d5ac747ae76b2b5624f3996b
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
new file mode 100644
index 000000000000..30c1bc1b4da7
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	digikam? ( png zlib fftw X )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	digikam? (
+		media-gfx/digikam
+		${QT_DEPEND}
+	)
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	digikam? ( dev-qt/linguist-tools )
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use digikam || use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use digikam; then
+		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
+		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
+	fi
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use digikam; then
+		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
+		exeinto "${DIGIKAMDIR}"
+		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
+	fi
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 9ee5fa843901..ced49f9167a5 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,5 +1,5 @@
 DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
 DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
 EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8
-EBUILD pngcheck-3.0.2.ebuild 692 BLAKE2B 44ec2d73dbee688678b367234744dd493278172fe3eec45e5f90d5726b97204f3db437ed67e736136e90b1aa0bd5676ab1b193f8c5e2dc4a534b57568352f5b3 SHA512 c3431d4d0f0c6a00062b794e8a64126d4e495287dd18bbd817153a3dfdb992f379b2d4f5440449d3e49632e33505baaa8efe26de93d6c51d0e01098149be3177
+EBUILD pngcheck-3.0.2.ebuild 691 BLAKE2B 59c3e0dc99f1844389dfa686adb3d93962a1f7e61cbc128d0c34a48c0d7ee08131a53bb015df039faa5aec0c50d01d858b6378b131788bfa6968d4af6245da95 SHA512 af2f6edb8cd1f1b2b06207b825a692fe53737264691f1b1a9bd330e90a571528e263b80cac32885f6dbb56647c7c8c659f25bcf11e957aea1b830f2957b74fb3
 MISC metadata.xml 244 BLAKE2B 5498c23eb35a869f92ff882d6931f50645f2a10ea31c9e22f892e9c5e11b54cbe7063decd5750b2cca2e8737ca7e5e5e7fa154401ddf8a2baadf7037be981241 SHA512 c6d20cd9c770b2ffa18b02ad2495493b61d681c2f1d54716aaf5a22a63db01219db3f4d3f743ec8abd24cba27bf5e3c0da3b80158a1b06b933965d8481349417
diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
index ad45b82c58e8..aa2d25b2a6ab 100644
--- a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
+++ b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz"
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8d1134d5f5b2..2bb14f83b753 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index e85c9aee6731..d29f15d010f7 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,5 +1,5 @@
 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
 DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
 EBUILD ganv-1.6.0-r1.ebuild 987 BLAKE2B 228b9642a9eaf93b06f90ef12c3aadce32fa4e493afd901c5c9ed1279d3714753cc283565cbb822b728834a0d432c0f9a59fbb67e841de324d8c9acf222535fc SHA512 8ac137065435e1e5ceb7a5be97cd8bbd7682869e848c4307b78c2a15b94559613189b68a63197c16ba2e132b564093b87e561a85084ac87ac9e9448f61da302c
-EBUILD ganv-1.8.0.ebuild 989 BLAKE2B 61b0c5760462c2c51edb417f2ad02624f60563e735b95f5e6dc68610e7e1ad8e2c89147792dabcac6fbf084e7c1706ede8179569be9b806603afcb7b9d07a18a SHA512 805ec99663db18953bb323f00bf5474d378ad46e125d90e51af836eab94ee667a59d8825b7bcaf5e12c52c0c45b80687db8d67605a88c47ae9f18768aaedb084
+EBUILD ganv-1.8.0.ebuild 987 BLAKE2B a019168597a0f53d2bcc7622df85573f09865cf533b2f50c2f03c718a5b6d57907511081d258d794de197aa2ee1af5a32bc344d7d958f32be71e7c179abf76df SHA512 b775cac5f042ba88699175e7bf61e64eda654c7b32b5ca7ab7146927c1bd16b9d1c124ca29c44a42a53659cd6e91dea8f5cdca874713dbc68b9acf39f78c2055
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
index a71cd3506df1..58367e54c0b2 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index cec84be2c700..885bed090b37 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,5 +1,5 @@
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
 EBUILD lcms-2.11.ebuild 1160 BLAKE2B 31a6b342cf59fee0faa0b1788f3af0ddd9c5b3a3b4c5a76774ff0818fa27a3213dc8c8171a5c2b1dcae6989001a79ec7749c0648f83190c14dadf4dbef7e7d7e SHA512 1a0b36d07060d269dd2f7a613683e1930a362489f48680351bfdcc1ae9c8d29e6d0428b3d2fb342a2f5a7d9f4ccc3b36d4ff3debf16a05f6f3bd79b9f469c5e5
-EBUILD lcms-2.12.ebuild 1244 BLAKE2B 05866cbd713634514c290322ae9b70e1c1897d802c102f352f11f9896b11ed048042f971804d35c4ddd034df4b9801870cd78ded2f57f97c9ed3528b3ebca372 SHA512 225147680a883e9ce66862c43a378400e99494e89dd55d7a1e7b573ea9624046f86ca07d792a8434f7bf647fd1c342a1fe852ab1484bc713b61c7b8dc6a1f287
+EBUILD lcms-2.12.ebuild 1244 BLAKE2B f115e34474e0f16a9c998ea2608faded1903802b46721bfc0d51c62155d2491c1ebab2b162b1bfb9277760f195ec4debfec5ca64e667f24e897289358a6e838e SHA512 a97858aff1caad42c283ac4a99152260f9f18667377731fe6d6f2f0affd5067cca9df45dfbca199a041401f854fd75023ec927442eda091137bbedc33313df4a
 MISC metadata.xml 464 BLAKE2B 83de84dcbe1b9e2997c7334eb55ae601e80a4cbb8c1fd0e5f5fb5c95470354d1657d8c5fe6f5b895a6071e39bcaefe4d3216385ad70ed6e42ac58a90bd5f33b8 SHA512 c63a193bf5607356c0d48e4e840355553f4fcd61f7d1269e7cf6cb198d462b786777ef46dd1e07c8edff0ea5311c42b3e5a2c8e709adb3e0b40dd538d7f3a60d
diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
index 4502bf4cde0c..6a1b118ac059 100644
--- a/media-libs/lcms/lcms-2.12.ebuild
+++ b/media-libs/lcms/lcms-2.12.ebuild
@@ -43,5 +43,5 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	find "${ED}" -type f -name "*.la" -delete || die
 
-	use doc && dodoc doc/*.odt
+	use doc && dodoc doc/*.pdf
 }
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index a3ffc6ae75b0..713fa44b9942 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,5 @@
 DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac
 DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a
 EBUILD libraw-0.20.0.ebuild 1382 BLAKE2B f37c63dcdbbf7bdd93af2fd7bf67d04c02d0c5c3d95b9b89c30ae806f6a5c31ab8862f4a7cc1c4851584e46f76a2805e6981f0a088f672e609ed1424ebdcf2ab SHA512 4941a712d519ac88903e1912de2e8bea816339fce8695af416a6229b627df14718576d43d30b715775eb26c5f5ba5d9bce152293cce96ea3289682f367d302cb
-EBUILD libraw-0.20.2.ebuild 1389 BLAKE2B d2394632a9affe6be4a55570935986d7bf1da5c3621e77077358c30931b1697ecd489ee19756266640bc6f23bddc685c3507617c23d0164d33c95826cf47411e SHA512 6889a4c0cdde5d3a77a43cb82148b090be6151e526c230ddcaee1d8c2d21a9a55e8f081309f1ca84ffe7f8270cbbeadfb4915aad9641701b95803a1d1e3b9e69
+EBUILD libraw-0.20.2.ebuild 1388 BLAKE2B eb6f64b84ac439502a108a0bf02621afa6102bc2c26603f661cec1569bb6daffa7f2020cfc18df349049695ad1851eebf6471a944a5dbe181de5a4da1f9e8c17 SHA512 a0346c97a40a799fbd7f321899cb08ca3145742d6c3c48cf2dc418d1e31731cb65bd295543b2c5973aac4de7a49d9f43b1b689506ea4e1befe22fb30035f0120
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild
index b25b30eab84f..52a67b675caf 100644
--- a/media-libs/libraw/libraw-0.20.2.ebuild
+++ b/media-libs/libraw/libraw-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 3654a95c5102..38ed6ba26759 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,5 +1,5 @@
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
 EBUILD lv2-1.18.0.ebuild 1364 BLAKE2B 257076159121287c575f5366b5473df431f941366ccefa8057127c903a4b4b299a932f4046ff54c0f2eed92330a45831d04288a800a8454857f96758cfa2ecf8 SHA512 dbcaa0e94b0b8533ed5efc73c37139262ce46c5bec88427fbe4fe5b7155a5cbeb7a7f0561fb188b7c8a12c4d39f57190acf6c9122e767c4d6dcd5bfa6c84ac10
-EBUILD lv2-1.18.2.ebuild 1370 BLAKE2B bdc9ead907338c571718831c7f880fe84f015d3fb67c2f6bfcad1c8177a56f64bb1a2d6e0dbb7cded2c7ee7e8cfa0f14bf913672bda86979ba4226e76192c30b SHA512 be79588c88bb1f27c8095caf1f2560325dbd7c5a840128d0c43cb50562744c403185a13990b7c9b4e68aacd6e7561a75c26e9bd05819633c2f2d912dc08b2d83
+EBUILD lv2-1.18.2.ebuild 1368 BLAKE2B 533f1c5af978890c606877ba831fc128585fe9253d3255c0d6018b7141778340b42640064ded69eb4603770b36704a87d59dea9c3cef92cb25ae373be8714e16 SHA512 7575b237669ab8802ffb35975f08c5a68c7266a5aaf6d435158dcb271b14bda9baeb5cf93f1b866faa5c9c4a632ead9f7f9bc154fe576589030ee9b5b89d3b6e
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index b18357182717..f4c3ee9edfd7 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 3458c3393825..d1c56b49a668 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 44f97bcd8b71..f6d35b41bd99 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-iptvsimple-7.1.0.tar.gz 180721 BLAKE2B 0ec7ac0ffd1eb480e3a3a956b3fbd79e5bc3607713839a72dff45dc2d22e66d006d354ec12a5606360703f3e6bb29457e17034a5644ba06fc5ef032b5f0690c4 SHA512 b4b97d94c216a195b3741dc816ab9441493550c4d9fa9c9b28ba58dfb31a4d94e3fd429384ca46bf3150a607c8c52feac402a6f18f664bc18353a7c40e54f85e
-DIST kodi-pvr-iptvsimple-7.2.0.tar.gz 181688 BLAKE2B 26f5abdccd88cb430b72c4313b0a7aa965b782c31057849e245fd9ea29f9826dcc635f657a508356bdaf3013331b0d131f7fca3a6921d41f6e756dbd4c449098 SHA512 616ed79e4fa76ec8cc69c61a136300f5d1f0f8923272b093be8b7dbc6c6a670500677394986954d982ad54c6998290f1c7f48ea934cfc0f5aac31c7e415d478b
-EBUILD kodi-pvr-iptvsimple-7.1.0.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
-EBUILD kodi-pvr-iptvsimple-7.2.0.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+DIST kodi-pvr-iptvsimple-7.4.0.tar.gz 187068 BLAKE2B 61058b3641f5d075b2919f2389edb0e51213e8582589b0dd80d5f772288e57cb8607e7c52166a02c79730ad7b53edf15aac97f750adc0a228c6c56704544f0d4 SHA512 c802c64dd77f55d0f54ebdade82b3ea89b19d6f1dc8f8b6a99b28bdd40bc2a4b16a635dff276fdf578cdd9e967d10550d96814a78c66bd224530fa3dcf1c8fe5
+EBUILD kodi-pvr-iptvsimple-7.4.0.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
deleted file mode 100644
index d29c62c10d9a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.2.0.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.4.0.ebuild
similarity index 100%
rename from media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.2.0.ebuild
rename to media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.4.0.ebuild
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index 2ab76eb2a596..bffb050ad38f 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,5 @@
 DIST mda-lv2-1.2.4.tar.bz2 2362219 BLAKE2B 2b943ab585ee55f909161ed562e4cd9a8b57cf1c61e5199ebc6917b5ca6108fd9e8cb4c48517f01c823b9ab7ce96461f6f5ff1c103897aaa8bfd182a5debd2bf SHA512 d2ae0a7531de36ed30d0fa6e377d42d44d8dc67e4893e075b1d850e92c3a2d92f6f80e292e642c71ad1493532a0e06734011028cfec91348cfda02eec62dfe04
 DIST mda-lv2-1.2.6.tar.bz2 2371464 BLAKE2B d9c6de99a3bac080df2a58db56673712a7c050fea76906bd8e1704f28b3588d990cc8c3ce2fe94b598b1b9a4acd751696775d6c19baee2bd7982853f2e2ae18b SHA512 0b49c8d4868010726bdf4b969b4822ffe17d705d81c956afabcfa27135c1bf54bb4fd00168d2606ddcd3f9b1930247655e700ae8d6039b43ff1a779cb8a617cc
 EBUILD mda-lv2-1.2.4.ebuild 484 BLAKE2B 6d489acd56dc021067c4b54c14be6e8eda5d2618ab3c1f2863cfcbd9ab696c60887c18032213cb8624145119adc08ef98b70c5d115dcf0d9367bf529996ecd1d SHA512 8ee176c879b2ffe31938d0524b369be932d8a34b8111dd9e3a0741d784352f86d3d698cbc77f3b184697a418cf126bcbdbd21a725fc8d00964c551bb2133850c
-EBUILD mda-lv2-1.2.6.ebuild 501 BLAKE2B a6f188013417bc94fe26f5e90ccec9ec56fa270351cd19b2b555cb5ac74b1d9b58863443bf4fdeb69bdf5b0e8302882e3d6db9e6305fb86cf5d2b77c548aa567 SHA512 c83269eb6a91eb6910573b9b220ce68c3ea475a2d57b9debe0948e0f3ba7535a882a3e76977005d7cf3f7ffb322339840d6ae7cd4e49385c4afac9c8dba8a4bf
+EBUILD mda-lv2-1.2.6.ebuild 499 BLAKE2B 2ac67b67772164df20b783b4cb68f60bfc182dc9af2f0fb8982a52fa6addff8040f9fee16ec9c0859f1d3ad0a75cdb75ddd5f606595149958f717ed5e1df91a1 SHA512 a0cf14317ea42e121d6a70573faf0a9e500e2430a7c1d313a502d60ee052de698e296546211ed811a22186399ca312303ba91e072cb4690e63dbe4f73babcf1b
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild
index 03cd62909368..c21746004648 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bd18232bc167..eadf3a0c17d8 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 1c424264842a..f25f0948da55 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -3,5 +3,5 @@ AUX jalv-1.6.6-suil-always.patch 410 BLAKE2B 7aee87986df386383990e2fc1c012592c95
 DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
 DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
 EBUILD jalv-1.6.4.ebuild 1286 BLAKE2B bb5f0a5bf6c67418015c72923a3dcdad25a80e35231359e116d1338322058047ab854b0cf5fbb8664a65fb952b0a88a6a6b5ef4c76cba8e401f4d9a5db4a596a SHA512 6e01e401027293d800245fc0289f2d1c92223b95042bbb844fa07c4ba8be3158cb7447f40b5abea5acffa2ee27a6ff1d82fa86f264bd03252310d5f6abfd7729
-EBUILD jalv-1.6.6.ebuild 1221 BLAKE2B a03d65a55bea245817e70c4918ec24e23c42e921494e723da3018b1107f2b78ce80e9691422bb6e3d75fa34d85d1b28d2043de81cece4c865b2af581544b6161 SHA512 9e159a126e5340db2c54c5e9871da95552791892e1011fe8f7cf598e1b46e9b0117fdf88c40e38f6f90837dfddcf0fafc8b4619a88147893912a36295a187960
+EBUILD jalv-1.6.6.ebuild 1220 BLAKE2B fd07f3e2a675afc446532077147f4324025eae70720396c132e209def4d5c1f183105b4affda28a06cd62ff9a70ff0b0aec37445b1a7569ca8c8ce5c8212786d SHA512 0ac8b2e49cdbb4814462f02c989bd3fc6e87f4b6970ecec113a3c2e40d5308d82e5e812ce0322acb4746006443111aad91734f8b3b3b955b8bafb7df1e255c86
 MISC metadata.xml 1051 BLAKE2B b6f05c6cb84eed6653069e98a49467816e383e39d388bfda8f1384222b55a22e656c807a607d96f395c0f11ec2869ebeda693d4585771a136eb6e03ca2d958a0 SHA512 3f16ac2415d2e4b411532bcbd9cba26830d3a28b84bffe4ea0d1764de762a185d3a5b2bbe30ddc6f9d2567d4527c7ed306a9002c6fa6971d4cf29da134492a47
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 08aa57a78622..42870c71a5f1 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gtk gtkmm portaudio qt5"
 
 RDEPEND="
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 3ec03388fa1c..7e2d150a3152 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -3,5 +3,5 @@ AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dba
 DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
 DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
 EBUILD patchage-1.0.2.ebuild 1071 BLAKE2B bd83e8d16610d33844a7ac6d4e316693f241e0c457fdf2ad9c6646c7b27004d29fbf430697cb06996fe00bbaab9dbf7f2d36995837b55fd86382bd1782bbd0d1 SHA512 035cd6edfba294a02ffb5026f5805834754df3f2ecd664f6cdffced93109d8091446f2b65a3661862bed24d1a219caaadd813af41577449fdddbada6028dffbd
-EBUILD patchage-1.0.4.ebuild 1007 BLAKE2B 77c5ede0aa637bb32e7a2b3be640234a019f79b5bd82642b4cb5fd0116b2bd90a2515111fcbe61085d692a85f831e8864338ce7eb2f95d574ca70f3117a6764e SHA512 825d4fc3881730c3cbdda6fe6f64abbd0c40ccf7697fd00eb1e537084061a99a82fb409274c7895495e8b3c3d8f02ea23dcd8a259ca3ee25fde9e27fcb8b3c8c
+EBUILD patchage-1.0.4.ebuild 1005 BLAKE2B 620a5712144aed5bfe0c647498489e5297c0b80d7043298bf16d3f5d65fb5b609f241b30c7b48696003d916af2247b568b4bb759ceef1811a45d3220a1a9d989 SHA512 12458b0af96e2acaba6244d90f16359c2c9a76aac0b65b1fcb9dc72b110b42bd6ba134833d3d63fdb07e9026469a831aa17c0b074f2d9bea95f2975babec6ef5
 MISC metadata.xml 460 BLAKE2B b2f9f3d58de315e1a6a807cbf8c02ace30e8ce14405078c0a694ff87667c0abaa4cec0243db6cb1f09ae2106709f030edc26eb3dde6a7cf4626b10585695b42f SHA512 a8bff330319ae354d6f6d158bc0a574d1c16be8a9794cd9bf908f5d216d56c10a1de8d51196e20799d397ad4895ea3ec80020c29d0220c1e03897c116a3094b9
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.4.ebuild
index 07b1e83730b7..a231618a5018 100644
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ b/media-sound/patchage/patchage-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack-dbus"
 
 BDEPEND="
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index 255ca5c9c230..e4490af65c5a 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,4 +1,4 @@
 AUX sndiod 58 BLAKE2B 66ccfb1e14b145e34851bf6f06566e9c7cbeb6d5a0b4af3d1ee189133441697563b828af9fc96d6313fd7597c89821a79b0d5d67e9b15c5658891605fa54dcfc SHA512 7afae426a04482ca556c360fedfb08e92dbf54af108db3725dce5db74d5332d8fc46481f04804674bec56aa901ab679bae6fdfc21a065c91333dbc169dfdc434
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
-EBUILD sndio-1.7.0.ebuild 862 BLAKE2B bf15daf727e3db6d19c16ddc6a67f37e8a474d20a1d536807a7686d3eb286c3645e0f4da0cec1ea8323eb60cf11f4dfd78a1a4a55540fd5a84adf4136f8e291d SHA512 b489a41cf744989b27dd089bd2a3f2b74c68fe656f9c8dde332a59a08916e71f80fa8a889e8af3f14e4b8260dd99004aef3daaccb636a4c1e3abe7e3f03bacb1
+EBUILD sndio-1.7.0.ebuild 868 BLAKE2B cb601034985d6e8c769ab2152e029560d47018c5cda74bde00010a84598c8d67c7d6542d8cbf21fc8af9139a5166f6004f7223f83bb181c71644ed433135fce6 SHA512 d4728567e7315e91f982397865d5edd7531858e41a2262b321e365a95ba6f46c67023a2cc235eb38a143627342d0467c4266ec3c48a0357d8e58094896f3c095
 MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
diff --git a/media-sound/sndio/sndio-1.7.0.ebuild b/media-sound/sndio/sndio-1.7.0.ebuild
index 24f14c1d8c3a..0c7d4a906671 100644
--- a/media-sound/sndio/sndio-1.7.0.ebuild
+++ b/media-sound/sndio/sndio-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sndio.org/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/7.0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
 IUSE="alsa"
 
 DEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a3ddd0dea315..8c1c2a7331a3 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 30c136efdbe2..4c4fcc7ff7b2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Feb 2021 11:08:36 +0000
+Mon, 08 Feb 2021 19:38:30 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 37832c8a8012..172d39fcb1ee 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 500540 BLAKE2B 7a48959b9c07be5fc6e9e98ffbda2d71400bbd137c089df45f7701ae5dd1ba444366d51af5a4656f0a37ca0bbed5e1b74627c57cf425e57c4516bb7194b7dc59 SHA512 e923ed887d7140a57ff660001f6646dac898bdcaefc8ab2effe01101b80e6b709f7e4d00bf72e6d181aa41f6d99fe7b4285de0597a1b60734104a3eee41ee946
-TIMESTAMP 2021-02-08T11:08:39Z
+TIMESTAMP 2021-02-08T19:38:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhG7dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhkzpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzuQ//XMcpY6DEA1aSef1C19uxXgiDOOa8Li2/R54JxlSxZTjWD2Vx5hEA9LEE
-FsnLvm1s+9Rxan6hKLvNDHd2drZUxGHjRouZo7GoMdfjTucuzJDM6f9ysFUw0Rnv
-CNx+pPuqLtLfATKxCbzedqWFVsjCVL7q/I1KhB+aSLXBoCcfK9iHABEmSA+lR8FU
-3bupLtafHxMWagNiatOGgP/l/j0TW28MCMu69rofqC7Iub6rLkw5XQQzLq2m3qbz
-tDlIF+2AmEH+vVh+6HjmcQjz/tsfUDuE+WP25mxEHLWC5S49sL/F/QnAz5NN6aZB
-EMZqKrddKj2jH6LEtl14IpQcEYXJWugJnZVfhgUzBcHDDWdiA7rh2YkA63+5IBa2
-xgxtYiC/XKigzyxvjQoZMxrs9/E6HrXHN6/GT3YHrqHr/u4L+FX9iH0/qYn6eNJp
-RufnQAemlzHqzl3HzY4R1M/DUYcYQl443KXnXDrmrSlUPAYa356LsrF+gP0vb8bJ
-XnO2IrSCXshkSXetzhlhJ6lgu/NpS/LyXgBr4HD75hDukM/bFGD+sqh/VxC8/q9h
-x5ZYwXr2z+NqONB/m38MgP0fm40vaCTfjLtZKgzaWQRkSBSY4o/OIYrjg+kmVvZA
-2qAsH/ESkVaNqERIdy4/QLrRzhpBl9zp/9rqC6w3/A+9lBZKAMA=
-=ztst
+klDtYBAAq4XDPe2MDBV0eHSfRZv8l38rNtXUn+9WCOjQh6TRp55v7dLKpaIUR8P6
+KeyW3iRG74yLqPLP2DkfLwZYDGEtN81TMDfUChBrNDL0BBFmYhMuWshuUZBAWnI/
+DYKuAi5ozAzQXg5550BztQXgMRI069vWqV+KvohRCeJhC59mcGWevronTh8o5n7j
+TawFNqMZtk5Kf/4ih/R7sU9mltr+EZRUKKHfL0sulPscIvsW8lgJfKV43b0G0Szt
+TSxnV25Ojc/TcPf/x4R3vgbq/Q/NMeBKdaxLmVfeb8cxV2U7Fn5UOfKu0UtCTdDX
+A2r6AKCYC0YfdJ6qfBI+m8mWTIGt1hl5pqjzb3zqQLi0FfAuIIf1eeK37NNCqpqc
++VFlF6zCOTFXtdFciOy31s35+9oIele0hlaOjoTPof81jlfdWN/6Pt34Q4pO8A+a
+5PIppg7otVItFDwC32MIAOltCGPqBv3AC1bSy8sc2YHw2chMX09hIN5kUKJ6fKgA
+agr8UITQG7Iss8pR+/rL3hknRbxV79fjOOo5uiKSVbPn5pxxaub1fghHwpK9ATos
+58BQIaOF+lXReM0crNq3dnki5CrYr9Hf6MYKvBiOzz1wBIDbg5s8ZI3UpL0O0oqq
+ozVL00CZVSalVaRHoqVkF9e01Peb3LW+Rm0ToxOJSgXvx4pi82s=
+=DuG4
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 30c136efdbe2..4c4fcc7ff7b2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Feb 2021 11:08:36 +0000
+Mon, 08 Feb 2021 19:38:30 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b5f863ced0f0..2422b78ba587 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 6fca0869dde8..fdfeb85f02e7 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-lua-4-r1 b/metadata/md5-cache/app-eselect/eselect-lua-4-r1
index 29f49b40362a..f49ce90c75db 100644
--- a/metadata/md5-cache/app-eselect/eselect-lua-4-r1
+++ b/metadata/md5-cache/app-eselect/eselect-lua-4-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Lua eselect module
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect !dev-lang/lua:0
 SLOT=0
-_md5_=72b75d0760db54ef27a14aa796d1b77f
+_md5_=236c8f5ff38908c535bb5a240d3536f3
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 192a8f71d7df..ad9eec094f05 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
index 62fc68df37b5..9f90fb24284f 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Collects system statistics and provides mechanisms to store the valu
 EAPI=7
 HOMEPAGE=https://collectd.org/
 IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_buddyinfo collectd_plugins_capabilities collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_check_uptime collectd_plugins_chrony collectd_plugins_connectivity collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_gpu_nvidia collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_logparser collectd_plugins_log_logstash collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_pcie_errors collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_procevent collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_slurm collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_synproxy collectd_plugins_sysevent collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_turbostat collectd_plugins_ubi collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_influxdb_udp collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_stackdriver collectd_plugins_write_syslog collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~x86
+KEYWORDS=~alpha amd64 ~arm ~x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
 RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d777cf4a8ff98a7957f1d42b1344cc6
+_md5_=cc3c1fa99740153068e7d5ea52d37dbf
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 1e72b537a710..cf589110afd2 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/coolreader-3.2.53 b/metadata/md5-cache/app-text/coolreader-3.2.53
new file mode 100644
index 000000000000..6797f9929288
--- /dev/null
+++ b/metadata/md5-cache/app-text/coolreader-3.2.53
@@ -0,0 +1,14 @@
+BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
+EAPI=7
+HOMEPAGE=https://github.com/buggins/coolreader/
+IUSE=wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+SLOT=0
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.53.tar.gz -> coolreader-3.2.53.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=513fd1a41150e40f49056e1729b18580
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
index efaa0c624fdb..2fa1bdfbc3f0 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook SGML DTD 4.1
 EAPI=7
 HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.1
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
 _eclasses_=sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8
-_md5_=07285fc0e376f06f628ea5026fe1ea6e
+_md5_=9674a1980ed63a529c934f01ba9ecad5
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
index 7fd6ed4754f8..a423bfc22e2d 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ b/metadata/md5-cache/app-text/highlight-3.57-r100
@@ -5,11 +5,11 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7319c7ae682dda06cc035a688279a911
+_md5_=56db539cba6db05f3e85912241d71c0c
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
index 8f901ee1d3bf..5d1a559a2aa8 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=GObject based library for handling and rendering epub documents
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgepub
 IUSE=+introspection
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b4ca7f83a0b9f617222ef876cd5c975
+_md5_=b4b61eee3e3d3b3403b2725e2017bb25
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
index 1ece758a03da..320b4040f2fb 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r6
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -4,11 +4,11 @@ DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity manageme
 EAPI=5
 HOMEPAGE=http://openjade.sourceforge.net/
 IUSE=doc elibc_glibc nls static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=elibc_glibc? ( net-libs/libnsl:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=438ccc7aedf9ef9ce2b889ea9452b8b6
+_md5_=f4b47019ea9dcd8a7a4cf00ab2409d7c
diff --git a/metadata/md5-cache/app-text/po4a-0.62 b/metadata/md5-cache/app-text/po4a-0.62
index 9832fc8adc6b..d7d4a900bdb9 100644
--- a/metadata/md5-cache/app-text/po4a-0.62
+++ b/metadata/md5-cache/app-text/po4a-0.62
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to ease the translation of documentation
 EAPI=7
 HOMEPAGE=https://po4a.org/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.62/po4a-0.62.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3c59cd86c824ad9a36d9d59270471240
+_md5_=a0f043bdf63711713923ccac9187721a
diff --git a/metadata/md5-cache/app-text/qpdf-10.1.0 b/metadata/md5-cache/app-text/qpdf-10.1.0
index 5565a03d36a3..c3b7a39ceec1 100644
--- a/metadata/md5-cache/app-text/qpdf-10.1.0
+++ b/metadata/md5-cache/app-text/qpdf-10.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
 EAPI=7
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.1.0.tar.gz
-_md5_=217f79c0121d31d28195dd7a166c08df
+_md5_=567676f044653edbdbafaabddb619da9
diff --git a/metadata/md5-cache/app-text/xpdf-4.03 b/metadata/md5-cache/app-text/xpdf-4.03
index e1f279924b0e..9ed7a3966969 100644
--- a/metadata/md5-cache/app-text/xpdf-4.03
+++ b/metadata/md5-cache/app-text/xpdf-4.03
@@ -5,10 +5,10 @@ DESCRIPTION=The PDF viewer and tools
 EAPI=7
 HOMEPAGE=https://www.xpdfreader.com
 IUSE=cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) i18n? ( BSD )
 RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
 SLOT=0
 SRC_URI=https://dl.xpdfreader.com/xpdf-4.03.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7e561c15997efa07c4c52181960e830
+_md5_=9c4c18a91145f6ff1774841a4d348cc0
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index db419484ee04..48d412b000c8 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/lfe-1.3.0_p20210112 b/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
new file mode 100644
index 000000000000..f99c803db526
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/erlang doc? ( app-text/pandoc )
+DESCRIPTION=Lisp-flavoured Erlang
+EAPI=7
+HOMEPAGE=http://lfe.github.io/
+IUSE=doc emacs
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://github.com/rvirding/lfe/archive/e5f20c459a13b35ed1e71b1d2667363af168e958.zip -> lfe-1.3.0_p20210112.zip
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2347cb6f5be023f69d51533d997d938b
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r106 b/metadata/md5-cache/dev-lang/lua-5.1.5-r106
index c12a9fde6597..b5f10181fd54 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r106
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r106
@@ -5,10 +5,10 @@ DESCRIPTION=A powerful light-weight programming language designed for extending
 EAPI=7
 HOMEPAGE=https://www.lua.org/
 IUSE=+deprecated readline abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-lua-3 readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-lang/lua:0
 SLOT=5.1
 SRC_URI=https://www.lua.org/ftp/lua-5.1.5.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	b2e405b5a3f051d58b50c9ffc6b883cf	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4dfbc4aabdb50c58b149e085697e7c51
+_md5_=24c2fb196faac3fe53bc47251cfc267f
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.6-r2 b/metadata/md5-cache/dev-lang/lua-5.3.6-r2
index d06ed16644b6..197c600d7e36 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.6-r2
+++ b/metadata/md5-cache/dev-lang/lua-5.3.6-r2
@@ -5,11 +5,11 @@ DESCRIPTION=A powerful light-weight programming language designed for extending
 EAPI=7
 HOMEPAGE=https://www.lua.org/
 IUSE=+deprecated readline test test-complete abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:0= ) !dev-lang/lua:0
 RESTRICT=!test? ( test )
 SLOT=5.3
 SRC_URI=https://www.lua.org/ftp/lua-5.3.6.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	b2e405b5a3f051d58b50c9ffc6b883cf	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b82a61504b00d57cbf91fea8d3a43b4c
+_md5_=4b1c535e544410631dac06daeed3997a
diff --git a/metadata/md5-cache/dev-lang/lua-5.4.2-r1 b/metadata/md5-cache/dev-lang/lua-5.4.2-r1
index f4c9ec52fa0b..665adac80ba0 100644
--- a/metadata/md5-cache/dev-lang/lua-5.4.2-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.4.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A powerful light-weight programming language designed for extending
 EAPI=7
 HOMEPAGE=https://www.lua.org/
 IUSE=+deprecated readline test test-complete abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:0= ) !dev-lang/lua:0
 RESTRICT=!test? ( test )
 SLOT=5.4
 SRC_URI=https://www.lua.org/ftp/lua-5.4.2.tar.gz test? ( https://www.lua.org/tests/lua-5.4.2-tests.tar.gz )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	b2e405b5a3f051d58b50c9ffc6b883cf	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a1fd29432a13bb627d9a5fe64bbabc9b
+_md5_=f6d4d52a1bc2ea580b4fa32272848d5e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index beb0f04eed33..a0d13cffeff2 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/crypto++-8.2.0-r2 b/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
index 3aa5262b555f..6dabb5a679cd 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
+++ b/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
@@ -9,4 +9,4 @@ LICENSE=Boost-1.0
 SLOT=0/8
 SRC_URI=https://www.cryptopp.com/cryptopp820.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=993a5df663762bf85cd7e95c559dc75e
+_md5_=73881dd595f5ebcc7db972300a1168ac
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.4.0 b/metadata/md5-cache/dev-libs/crypto++-8.4.0
index e6cb16cf917c..ec93f56a9c43 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.4.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.4.0
@@ -9,4 +9,4 @@ LICENSE=Boost-1.0
 SLOT=0/8.4
 SRC_URI=https://www.cryptopp.com/cryptopp840.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c7eb3bc79cb8caec56623d600290b613
+_md5_=dcdfd6776a4c0895d5a6456d737248be
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.4 b/metadata/md5-cache/dev-libs/libmanette-0.2.4
index 4ca8b7a7d30a..ac811da947c9 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.4
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.4
@@ -5,11 +5,11 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=+introspection +udev +vala
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	fdaf2a7b9376934c1c7ddbd32114defb	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25dab7a6ed4b1290b94aa980cac6f629
+_md5_=79738f8143eb6dee1a77256492d4f768
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1 b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
new file mode 100644
index 000000000000..e05c97c0ee54
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
+EAPI=7
+HOMEPAGE=https://github.com/taocpp/PEGTL
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1325f8091fe496305a545de28548cca
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.8 b/metadata/md5-cache/dev-libs/sord-0.16.8
index 07f0fadff967..b9cfa6d3889e 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.8
+++ b/metadata/md5-cache/dev-libs/sord-0.16.8
@@ -5,11 +5,11 @@ DESCRIPTION=Library for storing RDF data in memory
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sord/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.8.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=c31559dc1159137c4dcd9184ab32b896
+_md5_=4b40885f135f0b77ab65c91748e264b7
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72 b/metadata/md5-cache/dev-libs/zziplib-0.13.72
index e9a21fc63f88..5f3e7dde7908 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
 EAPI=7
 HOMEPAGE=https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/
 IUSE=sdl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a8a2a75c9321dc6b9d05c7b7bc19b69
+_md5_=976477c64a6e4daeac33a6bd525a2859
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 069fd2e36f52..c9e57321faa1 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r10 b/metadata/md5-cache/dev-lua/lutok-0.4-r10
index 8a5c9b9be889..e65cbd99c470 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r10
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r10
@@ -5,7 +5,7 @@ DESCRIPTION=Lightweight C++ API library for Lua
 EAPI=7
 HOMEPAGE=https://github.com/jmmv/lutok
 IUSE=test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e14a0d7b3cbcce2f8f3fae0594cf7e85
+_md5_=1568e156ac52d30aa872dfaf24237e43
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 79d3f586dfb1..21b5b525b6b7 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/alcotest-1.2.3 b/metadata/md5-cache/dev-ml/alcotest-1.2.3
new file mode 100644
index 000000000000..f98a7d568e7f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/alcotest-1.2.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/astring:= dev-ml/cmdliner:= dev-ml/core_kernel:= dev-ml/fmt:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A lightweight and colourful test framework
+EAPI=7
+HOMEPAGE=https://github.com/mirage/alcotest/
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=dev-ml/astring:= dev-ml/cmdliner:= dev-ml/core_kernel:= dev-ml/fmt:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.2.3
+SRC_URI=https://github.com/mirage/alcotest/archive/1.2.3.tar.gz -> alcotest-1.2.3.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=5ba4bb65f369a75ba6ab51412d5b8011
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.7 b/metadata/md5-cache/dev-ml/opam-2.0.7-r1
similarity index 68%
rename from metadata/md5-cache/dev-ml/opam-2.0.7
rename to metadata/md5-cache/dev-ml/opam-2.0.7-r1
index a849ddd6754d..75c75f65ea92 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-2.0.7-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= dev-ml/opam-client:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=A source-based package manager for OCaml
 EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= dev-ml/opam-client:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
 _eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=ccf83bdcf7c1a1e6d8634e57e500eb39
+_md5_=5406e2e1e4076c24a208e9b61faa9d6c
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
new file mode 100644
index 000000000000..06ba09f92a95
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A source-based package manager for OCaml
+EAPI=7
+HOMEPAGE=http://opam.ocaml.org/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=d33e5a6fbeb3b39b79379ee723937328
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.7 b/metadata/md5-cache/dev-ml/opam-client-2.0.7
deleted file mode 100644
index 053c41455eca..000000000000
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/opam-state:= dev-ml/opam-file-format:= dev-ml/re:= dev-ml/opam-solver:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=[ocamlopt?]
-DESCRIPTION=opam client libraries
-EAPI=7
-HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/opam-state:= dev-ml/opam-file-format:= dev-ml/re:= dev-ml/opam-solver:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/2.0.7
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
-_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=3f2538e2eeb73e19e9fafec0a80a5368
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1 b/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1
new file mode 100644
index 000000000000..88c3ec655046
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.7:= ~dev-ml/opam-state-2.0.7:= ~dev-ml/opam-solver-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam client libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.7:= ~dev-ml/opam-state-2.0.7:= ~dev-ml/opam-solver-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=17458fd707733a4a8d791797aba78695
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8 b/metadata/md5-cache/dev-ml/opam-client-2.0.8
new file mode 100644
index 000000000000..1766a771f1a3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam client libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=bb280d6c892557cea037eadd8bc40a87
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.8 b/metadata/md5-cache/dev-ml/opam-core-2.0.8
new file mode 100644
index 000000000000..564f33ddad9d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.8
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= dev-ml/cppo >=dev-lang/ocaml-4:=
+DESCRIPTION=Core libraries for opam
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=opam	b4de444efce371928602cbf4cd91307e
+_md5_=ab84384b9785de53bc9dea7d3c46609f
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.2 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
new file mode 100644
index 000000000000..54976e43ee62
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=test? ( dev-ml/alcotest ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Parser and printer for the opam file syntax
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/opam-file-format
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.1.2
+SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.2.tar.gz -> opam-file-format-2.1.2.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=c5b354130d0ca3639dcd6d0a4b38202d
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.7 b/metadata/md5-cache/dev-ml/opam-format-2.0.7-r1
similarity index 61%
rename from metadata/md5-cache/dev-ml/opam-format-2.0.7
rename to metadata/md5-cache/dev-ml/opam-format-2.0.7-r1
index d93fcf2c35f7..eda3c3e42aff 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.7-r1
@@ -1,13 +1,13 @@
 BDEPEND=dev-lang/ocaml
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-ml/opam-core:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cppo >=dev-lang/ocaml-4:=
+DEPEND=~dev-ml/opam-core-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cppo >=dev-lang/ocaml-4:=
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/opam-core:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=
+RDEPEND=~dev-ml/opam-core-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
 _eclasses_=opam	b4de444efce371928602cbf4cd91307e
-_md5_=1bdc1586df1d9e4e9b1c0a8364ca0d6b
+_md5_=7c71e16434c187740eafe9b58c0ea46a
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8 b/metadata/md5-cache/dev-ml/opam-format-2.0.8
new file mode 100644
index 000000000000..2c09e18c1f8a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Core libraries for opam
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=cba29d701abb685c21dba96f658ec2d5
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.7 b/metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
similarity index 61%
rename from metadata/md5-cache/dev-ml/opam-installer-2.0.7
rename to metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
index 10aad6e2b3a1..2b35e7db84e7 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
@@ -1,13 +1,13 @@
 BDEPEND=dev-lang/ocaml
 DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/findlib >=dev-lang/ocaml-4:=
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.7 dev-ml/findlib >=dev-lang/ocaml-4:=
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.02.3 >=dev-lang/ocaml-4:=
+RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.7 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.7/opam-full-2.0.7.tar.gz
 _eclasses_=opam	b4de444efce371928602cbf4cd91307e
-_md5_=0b21f1b0372b4347603cfd41e5f4acc4
+_md5_=c788c17776530a9237528a227f088af0
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8
new file mode 100644
index 000000000000..395d42ca2a85
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 dev-ml/findlib >=dev-lang/ocaml-4:=
+DESCRIPTION=Core installer for opam packages
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-lang/ocaml-4:=
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
+_eclasses_=opam	b4de444efce371928602cbf4cd91307e
+_md5_=f3804c2b8b1e61decde6f37d6c08b7a9
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.7 b/metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
similarity index 60%
rename from metadata/md5-cache/dev-ml/opam-repository-2.0.7
rename to metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
index c0fb07f6589e..8fc63c790362 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/opam-format:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/opam-format:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
 _eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=d1154447a2cc2dcec38423494fe85cdc
+_md5_=26cd2530a10988cb4b9c17558cefddf4
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
new file mode 100644
index 000000000000..c1a11cea80ee
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam repository libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=26cd2530a10988cb4b9c17558cefddf4
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.7 b/metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
similarity index 52%
rename from metadata/md5-cache/dev-ml/opam-solver-2.0.7
rename to metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
index e63c40506f4c..b325fc1c7f95 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/opam-format:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=opam solver
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/opam-format:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=~dev-ml/opam-format-2.0.7:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
 _eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=4da00956ac854b084e03b7c3d87fc872
+_md5_=c56579a3284b4657094d8e3ee8d9ab2b
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
new file mode 100644
index 000000000000..fa92421db875
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam solver
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=0232f6edaaeece1425e1dd310bfe12e3
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.7 b/metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
similarity index 61%
rename from metadata/md5-cache/dev-ml/opam-state-2.0.7
rename to metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
index b67a92597e70..2f99b715f7cb 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.7
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/opam-repository:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DEPEND=~dev-ml/opam-repository-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/opam-repository:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RDEPEND=~dev-ml/opam-repository-2.0.7:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/2.0.7
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
 _eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
-_md5_=9b37b630786844cab455188e346ac5f5
+_md5_=2ad2a0a5bf7600006cf7b8ec39260a8e
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8 b/metadata/md5-cache/dev-ml/opam-state-2.0.8
new file mode 100644
index 000000000000..ee25354a7ed5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam state libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	47ad7c3f0508f77304c2d036ca24bcfa
+_md5_=9ad21668e4acf177e776532ee41e2fc1
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 1e7013c932b2..41b66f657205 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/SGMLSpm-1.1-r1 b/metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
index 36837827bdb4..2283a0ad42be 100644
--- a/metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
+++ b/metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Module-Build dev-lang/perl
 DESCRIPTION=Perl library for parsing the output of nsgmls
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/SGMLSpm
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dca0cb34604470f1a451e8c2f572313d
+_md5_=9b83560039dd7a4fc7c45ed33f21723b
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index 7c2521eda2e7..d2117e0a85e3 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Get number of occupied columns of a string on terminal
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Text-CharWidth
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4d6e6102f43bd30c3e74fe759b5d9eb
+_md5_=eb1dc4624abf66b5736363f08d94bef7
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index 349079ee8cff..251e624b28a8 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 DESCRIPTION=Internationalized substitute of Text::Wrap
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Text-WrapI18N
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea8fffac68c90a22eea5b54762eadfe5
+_md5_=a0219bc582e5dfc283cf22c50b11ffbc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 972699654e40..a543f798637a 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/bracex-2.1.1 b/metadata/md5-cache/dev-python/bracex-2.1.1
new file mode 100644
index 000000000000..95dc555aef3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bracex-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/mkdocs[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-material[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pyspelling[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bash style brace expansion for Python
+EAPI=7
+HOMEPAGE=https://github.com/facelessuser/bracex https://pypi.org/project/bracex
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/bracex/archive/2.1.1.tar.gz -> bracex-2.1.1.tar.gz
+_eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	docs	ab81eebd98db486ca36ad1e30ac2b7c5	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=666ecf1801e15cf13a2d08e66ee26ec0
diff --git a/metadata/md5-cache/dev-python/construct-2.10.59 b/metadata/md5-cache/dev-python/construct-2.10.59
index 863c508c8667..a1e5f759ab31 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.59
+++ b/metadata/md5-cache/dev-python/construct-2.10.59
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/arrow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/arrow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cloudpickle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A powerful declarative parser for binary data
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.59.tar.gz -> construct-2.10.59.tar.gz
 _eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0ffa35e78fb530c139c6f35601913ab4
+_md5_=5b4d650f52b4b7042c8459f388f05cdc
diff --git a/metadata/md5-cache/dev-python/cryptography-3.3.2 b/metadata/md5-cache/dev-python/cryptography-3.3.2
index a1271900708a..217cddec9f0f 100644
--- a/metadata/md5-cache/dev-python/cryptography-3.3.2
+++ b/metadata/md5-cache/dev-python/cryptography-3.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=7
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl idna test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] idna? ( >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.8:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) !libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-3.3.2.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.3.2.tar.gz )
 _eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8efd86b17a81081ed75422e949d2ef52
+_md5_=d508030b23c98d91a212e243e237a312
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.0.0 b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
new file mode 100644
index 000000000000..8da3935ca6d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
+EAPI=7
+HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.0.0.tar.gz
+_eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=85d4b3cbd30cbae2dfd0059b7115bf41
diff --git a/metadata/md5-cache/dev-python/lmfit-1.0.2 b/metadata/md5-cache/dev-python/lmfit-1.0.2
index f3fd7c7e6872..3ee80cdc2005 100644
--- a/metadata/md5-cache/dev-python/lmfit-1.0.2
+++ b/metadata/md5-cache/dev-python/lmfit-1.0.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/asteval-0.9.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uncertainties-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-python/asteval-0.9.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uncertainties-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/future[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/asteval-0.9.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uncertainties-3.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Non-Linear Least-Squares Minimization and Curve-Fitting for Python
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmfit/lmfit-1.0.2.tar.gz
 _eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=728fc2a87cad62a18314b9be7295bdf8
+_md5_=bd99844bbf4ef13470b5833c6ba4b88c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index cf42b9f0f7dd..2f73a22dbe86 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/nokogiri-1.11.1-r1 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r1
index 2b993a53e90d..b3648b23cc7d 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=7
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.10:= >=dev-libs/libxslt-1.1.34 virtual/libiconv ruby_targets_ruby25? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.1.tar.gz -> nokogiri-1.11.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	ec7b495f660dc38b1da9b6a19c75ecdd	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75b13e73c6b468471ce2390962655787
+_md5_=8745acd58f94aac42b96378f7dc4ca94
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e3278468ae4f..3f4711cc40f6 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/goland-2020.3 b/metadata/md5-cache/dev-util/goland-2020.3.2
similarity index 85%
rename from metadata/md5-cache/dev-util/goland-2020.3
rename to metadata/md5-cache/dev-util/goland-2020.3.2
index a05c92b95604..99510b05101c 100644
--- a/metadata/md5-cache/dev-util/goland-2020.3
+++ b/metadata/md5-cache/dev-util/goland-2020.3.2
@@ -7,6 +7,6 @@ LICENSE=|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBra
 RDEPEND=virtual/jdk dev-lang/go
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://download.jetbrains.com/go/goland-2020.3.tar.gz
+SRC_URI=https://download.jetbrains.com/go/goland-2020.3.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c72d5f0be1c49ec176579178c7dcb866
+_md5_=437512ae178b2caa56dbd96dd9e900bd
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.8.1 b/metadata/md5-cache/dev-util/pkgcheck-0.8.1
index 1808fcc3ca89..303d2d9ea50b 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.8.1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tree-sitter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.8.1.tar.gz
 _eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b85c0c322a671e9b6709ca437b4c3367
+_md5_=cf1d808ca070256c8b5591ed989821a3
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 5a8283fef4bf..c9f01baf3f2e 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.8.0 b/metadata/md5-cache/gui-libs/libwpe-1.8.0
index e27ffa54c4fd..d2c5a009b160 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.8.0
+++ b/metadata/md5-cache/gui-libs/libwpe-1.8.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.8.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82f1d52de940b235a5a8152e11fb9df1
+_md5_=5691b009abba86ed2b6f9f632d2740b0
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
index 3840c925cfbb..10ec0c413662 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-li
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.5.90:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.8.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8aae7261996e35dbf88dfafaa8134cb1
+_md5_=e0d6cbb229589c23c38b3000a4b6784b
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 3c937fe78ed4..113a3d27c755 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/claws-mail-3.17.7 b/metadata/md5-cache/mail-client/claws-mail-3.17.7
index 561db4112bc9..0781357aaeb9 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.7
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.7
@@ -5,11 +5,11 @@ DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
 IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.7.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ecf3f61075f4178d8494e475bbe9754
+_md5_=8fdc3a2f50cab64eb713b0332470ff8f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f88d1b7b3566..c922bde3da92 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/darktable-3.4.1 b/metadata/md5-cache/media-gfx/darktable-3.4.1
new file mode 100644
index 000000000000..5be7e7bec424
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/darktable-3.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-python/jsonschema-3.2.0 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2 ) colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gmic? ( media-gfx/gmic ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A virtual lighttable and darkroom for photographers
+EAPI=7
+HOMEPAGE=https://www.darktable.org/
+IUSE=avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua nls opencl openmp openexr test tools webp l10n_af l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_he l10n_hu l10n_it l10n_pl l10n_pt-BR l10n_ru l10n_sk l10n_sl +lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2 ) colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gmic? ( media-gfx/gmic ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.4.1/darktable-3.4.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -> darktable-usermanual-3.4.0.pdf )
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a4576270eea02124dec22bb6175fba24
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.5 b/metadata/md5-cache/media-gfx/gmic-2.9.5
new file mode 100644
index 000000000000..0a5c8bc78d78
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) digikam? ( media-gfx/digikam >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) digikam? ( dev-qt/linguist-tools ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) digikam? ( media-gfx/digikam >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=digikam? ( png zlib fftw X ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.9.5.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7439a7fd4157db01fad4715308574ebd
diff --git a/metadata/md5-cache/media-gfx/pngcheck-3.0.2 b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
index d062a5865d3d..1b659e0edae6 100644
--- a/metadata/md5-cache/media-gfx/pngcheck-3.0.2
+++ b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Verifies the integrity of PNG, JNG and MNG files with internal checksums
 EAPI=7
 HOMEPAGE=http://www.libpng.org/pub/png/apps/pngcheck.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/png-mng/pngcheck-3.0.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ed43cb38378e8483d0bc1e74f5be36e
+_md5_=67f5557519a8ab15cbee2ec78784ad57
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 315e305b3401..662a367e8676 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/ganv-1.8.0 b/metadata/md5-cache/media-libs/ganv-1.8.0
index 549f406a2e38..1cda59cc45f7 100644
--- a/metadata/md5-cache/media-libs/ganv-1.8.0
+++ b/metadata/md5-cache/media-libs/ganv-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ widget for interactive graph-like environments
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/ganv/
 IUSE=+fdgl +graphviz introspection nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 graphviz? ( media-gfx/graphviz[gtk] ) introspection? ( app-text/yelp-tools dev-libs/gobject-introspection:=[doctool] )
 SLOT=0
 SRC_URI=http://download.drobilla.net/ganv-1.8.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=083124e06591ad5c22121ab2e40bc5c9
+_md5_=f08b947a4a4fc585b01c149f3c9e2c12
diff --git a/metadata/md5-cache/media-libs/lcms-2.12 b/metadata/md5-cache/media-libs/lcms-2.12
index 17fa11d57256..7b90900bef32 100644
--- a/metadata/md5-cache/media-libs/lcms-2.12
+++ b/metadata/md5-cache/media-libs/lcms-2.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mm2/Little-CMS/releases/download/lcms2.12/lcms2-2.12.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=de244e6bf1d75c7a1729f374cdd9589a
+_md5_=cc76b9b4987f4cf248b040d80b31fa16
diff --git a/metadata/md5-cache/media-libs/libraw-0.20.2 b/metadata/md5-cache/media-libs/libraw-0.20.2
index 4ac132dfa03c..c0ed560e060f 100644
--- a/metadata/md5-cache/media-libs/libraw-0.20.2
+++ b/metadata/md5-cache/media-libs/libraw-0.20.2
@@ -5,10 +5,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=7
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=examples jpeg +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/20
 SRC_URI=https://www.libraw.org/data/LibRaw-0.20.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fae0ccc25eac734806357a0200e21286
+_md5_=2f46a7d9d6618bca58e2ba16ea7b265b
diff --git a/metadata/md5-cache/media-libs/lv2-1.18.2 b/metadata/md5-cache/media-libs/lv2-1.18.2
index 86bd9457f229..596e45336d44 100644
--- a/metadata/md5-cache/media-libs/lv2-1.18.2
+++ b/metadata/md5-cache/media-libs/lv2-1.18.2
@@ -5,11 +5,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=7
 HOMEPAGE=https://lv2plug.in/
 IUSE=doc plugins python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/rdflib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/rdflib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/rdflib[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://lv2plug.in/spec/lv2-1.18.2.tar.bz2
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=1a292bf8ca25b6d646eb0bb205d84226
+_md5_=b541eb5b60625ea539ba781689b74358
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 51d8141453d2..9c17eb5cae9a 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/kodi-pvr-iptvsimple-7.1.0 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.1.0
deleted file mode 100644
index fb8b2156c83a..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.1.0-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.1.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ff0d91aee56e04a7212a486c1047c2e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.2.0 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.4.0
similarity index 88%
rename from metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.2.0
rename to metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.4.0
index 9260f2aa432e..fe4cd6eaf29a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.4.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.2.0-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.2.0.tar.gz
+SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.4.0-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.4.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.2.6 b/metadata/md5-cache/media-plugins/mda-lv2-1.2.6
index acfcf5f71174..5268dbb6e953 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.2.6
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.2.6
@@ -4,10 +4,10 @@ DEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-
 DESCRIPTION=LV2 port of the MDA plugins by Paul Kellett
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/mda-lv2/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.2.6.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=35fd2799566c3c9190bd1e12b59a425e
+_md5_=50d136c0a8eb026302fea85bee4387a7
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e2ca4c15ae69..53b0f83056b9 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/jalv-1.6.6 b/metadata/md5-cache/media-sound/jalv-1.6.6
index 645d8fef3df3..d57698f8d54e 100644
--- a/metadata/md5-cache/media-sound/jalv-1.6.6
+++ b/metadata/md5-cache/media-sound/jalv-1.6.6
@@ -5,10 +5,10 @@ DESCRIPTION=Simple but fully featured LV2 host for Jack
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/jalv/
 IUSE=gtk gtkmm portaudio qt5
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=ISC
 RDEPEND=dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil gtk? ( x11-libs/gtk+:3 ) gtkmm? ( dev-cpp/gtkmm:2.4 ) portaudio? ( media-libs/portaudio ) !portaudio? ( virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://download.drobilla.net/jalv-1.6.6.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6
-_md5_=170266e5a8ac6ec0207326c210cc8c39
+_md5_=e0b71e9ec98207b99e7e655fc89db03e
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.4 b/metadata/md5-cache/media-sound/patchage-1.0.4
index cfea3ab932e2..6f950c7b9c58 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.4
+++ b/metadata/md5-cache/media-sound/patchage-1.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/patchage
 IUSE=alsa debug jack-dbus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 dev-cpp/libgnomecanvasmm:2.6 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
 SLOT=0
 SRC_URI=http://download.drobilla.net/patchage-1.0.4.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	0a6e492cdcbd52b1304cfcd9eba5abc6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fe84c513ace784f5a792003dd1417b0
+_md5_=16fc3ae62007e07156f09b706fc93ea6
diff --git a/metadata/md5-cache/media-sound/sndio-1.7.0 b/metadata/md5-cache/media-sound/sndio-1.7.0
index 444b2fad1a03..d2b5a4a1cb2a 100644
--- a/metadata/md5-cache/media-sound/sndio-1.7.0
+++ b/metadata/md5-cache/media-sound/sndio-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=small audio and MIDI framework part of the OpenBSD project
 EAPI=7
 HOMEPAGE=http://www.sndio.org/
 IUSE=alsa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~hppa
 LICENSE=ISC
 RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-user/sndiod
 SLOT=0/7.0
 SRC_URI=http://www.sndio.org/sndio-1.7.0.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=01bb2c2e9e30c1f88afea23fa924b042
+_md5_=cfe80b03cb97e582a0a88b2525eada7e
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f04260cfae58..95aa31ccb5da 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/webkit-gtk-2.30.4-r1 b/metadata/md5-cache/net-libs/webkit-gtk-2.30.4-r1
index 29e1a6bc24a6..0af96319ed00 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.30.4-r1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.30.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=7
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= 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.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.30.4.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54899be1874e478f8070ac65ed423656
+_md5_=70d804689ee12df21febcc1ef246326c
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d29e99bad248..f9c5fa4b03e8 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/ytnef-1.9.3 b/metadata/md5-cache/net-mail/ytnef-1.9.3
index 87160dfa1cb4..7607ffb3d8f8 100644
--- a/metadata/md5-cache/net-mail/ytnef-1.9.3
+++ b/metadata/md5-cache/net-mail/ytnef-1.9.3
@@ -5,10 +5,10 @@ DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
 EAPI=7
 HOMEPAGE=https://github.com/Yeraze/ytnef
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/MIME-tools
 SLOT=0
 SRC_URI=https://github.com/Yeraze/ytnef/archive/v1.9.3.tar.gz -> ytnef-1.9.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=52cac54b794e54b74441754f995f7914
+_md5_=f6f2d35afe49bb653c6ddf3a61492bbf
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 82ed50b060b9..2511e7938dd0 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/chrony-4.0-r1 b/metadata/md5-cache/net-misc/chrony-4.0-r1
new file mode 100644
index 000000000000..c1ca332ec1af
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-4.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=nettle? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
+DESCRIPTION=NTP client and server programs
+EAPI=7
+HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
+IUSE=+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) nts? ( nettle )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3ac613d31771d37c0521b27fe765a826
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index c99650417ea6..f3366f1db3c6 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -1,15 +1,15 @@
 BDEPEND=nettle? ( virtual/pkgconfig ) virtual/w3m virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
 DESCRIPTION=NTP client and server programs
 EAPI=7
 HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
-IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux
+IUSE=+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-REQUIRED_USE=sechash? ( nettle ) html
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) nts? ( nettle ) html
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d569ae23d676b706b61b60f007e25ec0
+_md5_=3ac613d31771d37c0521b27fe765a826
diff --git a/metadata/md5-cache/net-misc/connman-1.39 b/metadata/md5-cache/net-misc/connman-1.39
new file mode 100644
index 000000000000..cdcd7a582d6c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-1.39
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Provides a daemon for managing internet connections
+EAPI=7
+HOMEPAGE=https://01.org/connman
+IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) wispr? ( net-libs/gnutls ) virtual/tmpfiles
+REQUIRED_USE=^^ ( iptables nftables )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/connman/connman-1.39.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c998c61260cb22d41d9b4724a2f14447
diff --git a/metadata/md5-cache/net-misc/connman-1.39-r1 b/metadata/md5-cache/net-misc/connman-1.39-r1
new file mode 100644
index 000000000000..95209fbe58af
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-1.39-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Provides a daemon for managing internet connections
+EAPI=7
+HOMEPAGE=https://01.org/connman
+IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) wispr? ( net-libs/gnutls ) virtual/tmpfiles
+REQUIRED_USE=^^ ( iptables nftables )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/connman/connman-1.39.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=354d20f5645e6f40e3910a9c82489a96
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r4 b/metadata/md5-cache/net-misc/curl-7.74.0-r4
index 017ee1882da2..372b797c0bb6 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r4
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r4
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
-IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9806d40a9c8fcd0c208ec3e17558a491
+_md5_=e6b6e15df00cf191bdfe8a2259516632
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 0080dff9e136..bc96eb0ffec3 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.13.1 b/metadata/md5-cache/net-p2p/syncthing-1.13.1
new file mode 100644
index 000000000000..172be795c9ee
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.13.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm 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.13.1.tar.gz -> syncthing-1.13.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-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/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.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/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.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/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/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.2.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.2.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.2.mod 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/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/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/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.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/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/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-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/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.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/dchest/siphash/@v/v1.2.2.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.2.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/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/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.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-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.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/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/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.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.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/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/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/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.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/greatroar/blobloom/@v/v0.5.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.5.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 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/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.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.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.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.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/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.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.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.2.mod -> github.com%2Fmattn%2Fgo-runewidth%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/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.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/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.zip -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.zip mirror://goproxy//github.com/miscreant/miscreant.go/@v/v0.0.0-20200214223636-26d376326b75.mod -> github.com%2Fmiscreant%2Fmiscreant.go%2F@v%2Fv0.0.0-20200214223636-26d376326b75.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/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.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/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/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/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/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.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.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/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.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/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.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/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.8.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.14.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.14.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.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/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.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.11.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.11.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/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/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20201210100135-17de26665ddc.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20201210100135-17de26665ddc.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.0.zip -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.0.mod -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//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.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.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.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.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-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-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.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-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201015000850-e3ed0017c211.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201015000850-e3ed0017c211.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.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.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.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-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/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-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-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.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.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.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.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.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.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1e21b65de08a85930e3fe1cbaf98125
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 0b01c507cd81..8c276c010bf7 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.31 b/metadata/md5-cache/net-proxy/privoxy-3.0.31
index 2fa117ee4f39..06aeee193700 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.31
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.31
@@ -5,11 +5,11 @@ DESCRIPTION=A web proxy with advanced filtering capabilities for enhancing priva
 EAPI=7
 HOMEPAGE=https://www.privoxy.org https://sourceforge.net/projects/ijbswa/
 IUSE=+acl brotli client-tags compression editor extended-host-patterns extended-statistics external-filters +fast-redirects +force fuzz graceful-termination +image-blocking ipv6 lfs +mbedtls openssl png-images selinux ssl +stats +threads toggle tools whitelists +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/privoxy acct-user/privoxy dev-libs/libpcre brotli? ( app-arch/brotli ) ssl? ( mbedtls? ( net-libs/mbedtls ) openssl? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) extended-host-patterns? ( dev-lang/perl ) selinux? ( sec-policy/selinux-privoxy ) tools? ( net-misc/curl dev-lang/perl )
 REQUIRED_USE=client-tags? ( threads ) toggle? ( editor ) compression? ( zlib ) brotli? ( zlib ) fuzz? ( zlib ) ssl? ( ^^ ( mbedtls openssl ) threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.31-stable-src.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d1cf6fff3c75cd719ada95444e0cefb6
+_md5_=aa9e4580361c6dbdd8b32cb4876b3b42
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 4ebf1204164c..8d14a43db9fa 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-8.4 b/metadata/md5-cache/sci-geosciences/gpxsee-8.4
new file mode 100644
index 000000000000..cd51d855f727
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-8.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=7
+HOMEPAGE=https://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/8.4.tar.gz -> gpxsee-8.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f12c9494054a256613fee603ebe58c6
diff --git a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0 b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
new file mode 100644
index 000000000000..0a87af36e1bf
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection gnome-base/gnome-common:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GTK+ widget for displaying OpenStreetMap tiles
+EAPI=7
+HOMEPAGE=https://nzjrs.github.io/osm-gps-map/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection
+SLOT=0
+SRC_URI=https://github.com/nzjrs/osm-gps-map/releases/download/1.2.0/osm-gps-map-1.2.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a26f7f09d32c5fac366cb731d07ed1b4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index d24733da1685..e8d9753d780c 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
new file mode 100644
index 000000000000..26902e5a367b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Driver library for GPIB (IEEE 488.2) hardware
+EAPI=6
+HOMEPAGE=https://linux-gpib.sourceforge.io/
+IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) firmware? ( sys-apps/fxload ) acct-group/gpib ~sci-libs/linux-gpib-modules-4.3.4
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=7005a99e55672312323d8ee637f3daa3
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
new file mode 100644
index 000000000000..c53ff87b6b4f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup unpack
+DEPEND=virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel modules for GPIB (IEEE 488.2) hardware
+EAPI=6
+HOMEPAGE=https://linux-gpib.sourceforge.io/
+IUSE=debug kernel_linux kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=13e5b291df4e5ad3b3a20b1f9bcd57e8
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 20b51c1df344..1ab574621339 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/bubblewrap-0.4.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
index ec62d09f4b52..dbc39713b6a4 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solutio
 EAPI=7
 HOMEPAGE=https://github.com/containers/bubblewrap/
 IUSE=selinux +suid kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.4.1/bubblewrap-0.4.1.tar.xz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bfb993f718f9a008787260bd7fb9774d
+_md5_=6197900949d824433e1c9d8e4683888e
diff --git a/metadata/md5-cache/sys-apps/systemd-246.6 b/metadata/md5-cache/sys-apps/systemd-246.6
index c0f35dfe94ba..1ae56aafe0ef 100644
--- a/metadata/md5-cache/sys-apps/systemd-246.6
+++ b/metadata/md5-cache/sys-apps/systemd-246.6
@@ -9,9 +9,9 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v246.6/systemd-stable-246.6.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a80ffb17278e04abcecc7d509ee0493
+_md5_=705bb9d04cdf5f48e135483023e317dd
diff --git a/metadata/md5-cache/sys-apps/systemd-247.2-r4 b/metadata/md5-cache/sys-apps/systemd-247.2-r4
index 949f845aee56..c72afe454a88 100644
--- a/metadata/md5-cache/sys-apps/systemd-247.2-r4
+++ b/metadata/md5-cache/sys-apps/systemd-247.2-r4
@@ -9,9 +9,9 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3fc11ceb0de9b685bd27dca7954376e7
+_md5_=37f78a5a62059dc580296ac5dcfa23a2
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 76929bb07746..49e09af7934a 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -9,8 +9,8 @@ LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] hwdb? ( >=sys-apps/hwids-20150417[udev] ) >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	fdaf2a7b9376934c1c7ddbd32114defb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3fc11ceb0de9b685bd27dca7954376e7
+_md5_=37f78a5a62059dc580296ac5dcfa23a2
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1 b/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
index 13e4ea4180c0..ce72b00bf1d1 100644
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
+++ b/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
 DESCRIPTION=Daemon protecting your computer against BadUSB
 EAPI=7
 HOMEPAGE=https://github.com/USBGuard/usbguard
 IUSE=bash-completion dbus ldap policykit systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
 REQUIRED_USE=policykit? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.6/usbguard-0.7.6.tar.gz
-_md5_=aaae9f1fe63729babecf12a90f823894
+_md5_=09013264e89f028677e6ab975b24f2f9
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.8 b/metadata/md5-cache/sys-apps/usbguard-0.7.8
index 542369ea6c9f..456a075153c2 100644
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.8
+++ b/metadata/md5-cache/sys-apps/usbguard-0.7.8
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
 DESCRIPTION=Daemon protecting your computer against BadUSB
 EAPI=7
 HOMEPAGE=https://github.com/USBGuard/usbguard
 IUSE=bash-completion dbus ldap policykit static-libs systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
 REQUIRED_USE=policykit? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c74c8b4ba497f18a7425f9c42446795
+_md5_=8d5fc419ad60e4942c92820e12b3b624
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0 b/metadata/md5-cache/sys-apps/usbguard-1.0.0
index 1e9875aa61d9..9afb1bcbda8f 100644
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0
+++ b/metadata/md5-cache/sys-apps/usbguard-1.0.0
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
 DESCRIPTION=Daemon protecting your computer against BadUSB
 EAPI=7
 HOMEPAGE=https://github.com/USBGuard/usbguard
 IUSE=bash-completion dbus ldap policykit static-libs systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/pegtl >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
 REQUIRED_USE=policykit? ( dbus )
 SLOT=0/1
 SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=288cd36f2b298a854f2bed8dba53313e
+_md5_=ab0cbccc4b5970681fa514a8018a0d04
diff --git a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2 b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
index 40fb8886a17c..f24e14aaa527 100644
--- a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+++ b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.40:2
 DESCRIPTION=Filtering proxy for D-Bus connections
 EAPI=7
 HOMEPAGE=https://github.com/flatpak/xdg-dbus-proxy
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
-_md5_=88a8a46a48bfd577e9e7c9d8bacb1ead
+_md5_=f7e884fc5a003a93990fe6457027f577
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 9214303e5659..f6acbf051439 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/timezone-data-2020f b/metadata/md5-cache/sys-libs/timezone-data-2020f
index 7ad85a89fcbe..7c3d4280e26f 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2020f
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020f
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 IUSE=nls leaps-timezone elibc_FreeBSD zic-slim
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020f.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020f.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b774d14d4b02c61d38977dc2b113c0f4
+_md5_=927ddec6b59a4eca313e41309780ef2e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 9d86a59b6d94..8c6f7e3c8791 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/audit-3.0 b/metadata/md5-cache/sys-process/audit-3.0
index 9cbba581d5bd..255dd2823c9a 100644
--- a/metadata/md5-cache/sys-process/audit-3.0
+++ b/metadata/md5-cache/sys-process/audit-3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=7
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.tar.gz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=1a0e51ff06bbe14573dda5b6af68e200
+_md5_=18d56daea719e4d0043268f75b52dc11
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index e2c1d26dd631..89551386678f 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_wsgi-4.7.1-r1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
new file mode 100644
index 000000000000..922d805dccc2
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND==www-servers/apache-2*
+DESCRIPTION=An Apache2 module for running Python WSGI applications
+EAPI=6
+HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) =www-servers/apache-2*
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
+_eclasses_=apache-module	b40f49b22e6e55c4a17f7ecded4f0425	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ad4db5f79f9274080db68d2d4e4fea6a
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index b545aa9786d1..dcc341a3af64 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.8.4 b/metadata/md5-cache/www-plugins/lightspark-0.8.4
new file mode 100644
index 000000000000..1c58b9c499ed
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/lightspark-0.8.4
@@ -0,0 +1,14 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/xz-utils:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( media-video/ffmpeg:0= ) gles2-only? ( media-libs/mesa:0=[gles2] ) !gles2-only? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
+DESCRIPTION=High performance flash player
+EAPI=7
+HOMEPAGE=https://lightspark.github.io/
+IUSE=cpu_flags_x86_sse2 curl ffmpeg gles2-only nsplugin ppapi profile rtmp
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=app-arch/xz-utils:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( media-video/ffmpeg:0= ) gles2-only? ( media-libs/mesa:0=[gles2] ) !gles2-only? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
+SLOT=0
+SRC_URI=https://github.com/lightspark/lightspark/archive/0.8.4.tar.gz -> lightspark-0.8.4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=994e6b7612518c65af894ba6fd663747
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4a12e6fcd05c..5daa6647fd8f 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/grub2-theme-preview-2.1.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.2.0
similarity index 96%
rename from metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
rename to metadata/md5-cache/x11-misc/grub2-theme-preview-2.2.0
index 4e848ffae556..4a196cc0becd 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.2.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
 RDEPEND=app-emulation/qemu dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.1.0.tar.gz -> grub2-theme-preview-2.1.0.tar.gz
+SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.2.0.tar.gz -> grub2-theme-preview-2.2.0.tar.gz
 _eclasses_=distutils-r1	e8980b05bfb91c37dea52d0da131ef6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	f1d4277b3ad100890cbd62e137f0a769	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=02739c1bf993dccb1318d32197abf553
+_md5_=aa7b14d6911a65bc37f313d2616b2bbb
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index ab0a7fc4ac46..f9f313e669cc 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.1 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
similarity index 98%
rename from metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.1
rename to metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
index 064f04826e15..1be92c5e36e9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=>=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14 >=xfce-base/libxfce4util-4.14 >=xfce-base/xfce4-panel-4.14:= app-laptop/hdapsd app-laptop/tp_smapi
 SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-1.0.1.tar.xz
+SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-1.0.3.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bfe681fde238e4c8e65d8af035eb470
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ac8448c7c75f..b7d55d8d72c1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 10791 BLAKE2B 09f2380110aa789ac78721e30475f1299e4ad1c319c0ed4063528b8b340c6df850f9e35e6e70a46a047e16ce75eaa9e985e1d001f821e5e7f37d7e1fe907233d SHA512 ff6a62b432bda8c24c2bc9e3bee6d4c86e622637ab7796f81e9646b073e66fac67f4adcb5692f71f31fac9c31987ce0c3a4ee8ddd5532a3407abaeca2c2a8def
-TIMESTAMP 2021-02-08T11:08:39Z
+TIMESTAMP 2021-02-08T19:38:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhG7dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAhkzpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB4ig//Tg5aqQ28tWIK9d5nckLtWxA3exqJif6ZcBk0kFVcoXGZifiOm7qGazr6
-zKqCfopxP9SA2M7AkpVTG+K6eGIO5DW5Qgc/0f0jXn8IpC5RGk60Puj7RwWCYjUi
-/B5RWgPFS0USJca08DMlCAf2mTZtlg2C6x2yquULyZME2DUQsIZDxS2h59kHLxnX
-Pg/Q+yPfQBvPCQGzPBrbJ++y0yFWNeJ4mRFEShe4NIPqfr+w9rFL3/u48A1uBbtg
-vtIKLrl9a4pBUDK8jSWqhB8EGSfsuA5JTPFA/EwcGgjbKYYs8X4AMM0mgtjjYzR2
-bJF8VmfyGj8Txo0kAkWBjYaQefZR2dpx9NuA9wl8NAFIFweBnAuzHJ0en7JlqoOQ
-XJu278P5aIvwrr4byinwh1opNu1GSuHjXTx3gtZ9ET8oZKqZjMSxjgJM4BOZa5bj
-9Svz3JciT5+ZD91ONRu6o4fHW15kD+WgeyKV5DyOt8IsRxJqPoNafLfNxsM28zOf
-zy9odl2kbXHVySoaMArfGtgcwfkNuA2c9yahxGTLJP/qACNjJ4H5KIA4QTuhV2Za
-5QADV/jd51K8CMCJDW4l5n4qgDsz7f49/7p2fLx8SWJ0XeTNg3h0xkvHH5eVAvvD
-dOOSJGHZK0OPv0aObxmRC0YddNDt4R0ur5PLEanXnqIQzz+1sNM=
-=RNTx
+klDFXxAAiTyqLwpqjB0UrxF4sCDRf4ctMyXaZYYwiLT5meMPz/1emKGdlVFsYneA
+F2zsZULaIl30FoqW0u89MUAoSG36NtGqQP0rsJQMI0MeTd1ZUxPCqbFlMm1rk9ni
+zKIlB5llgHScNmO5FzcX1r1fxQD1DUaB4NoKrMqyozayDq/SG3mboYCAg0CghVQH
+TBfBuDMEC3jhZiiQXIXhgSjCVrGqp0XYHm3iLhtic0QO+SMzWppQ67Q8OvFYhV+k
+z1z6N52c5bO2J55sy02HBl1H1wMs2A+Jfb+oAgn5tmWVkw8AWloBS45x4wKp0CNe
+fJ0UOswcyJaJkh15zAalIBppDXrVDjrahCTt5uDTAewO8Vq1UYaFg1HZSV5hMoI5
+MMmeQpnKqO7Jplnd18j8TiSvOCyXqi21l/GoWhVtM6szWR8gfQW/cTEDUdfIVHbJ
+H+To+noheueoy4N7rqlDufXD0eqvnnp3RLbOtMyvVR4maepmzCr2H404J+OUpzsX
+nPiu7027Sdeq+YLz3cjGTZWcWocxBE/POiOgElJvyaXuzd8A7cOvAuhcZLmejiOl
+oWPb6G8iIOae/fw5ZboTT2l4wj5KVlg5a6dd43Z1ODiwyUaRJP8T9KSyEMhDbBJK
+8Uad8yCp6gcEywFdkTU9GsdvG1TTKgy77EoiRsBCmBOPKm8lpjg=
+=Et1p
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 30c136efdbe2..4c4fcc7ff7b2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Feb 2021 11:08:36 +0000
+Mon, 08 Feb 2021 19:38:30 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a28517a5b36e..db7f73896a9a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb  8 11:08:36 AM UTC 2021
+Mon Feb  8 07:38:30 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index e390a350bc4e..37eeea039756 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2900,7 +2900,7 @@
 1911131109 ./app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
 1911031739 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild
 2101061639 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
-2101240709 ./app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
+2102081839 ./app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
 2002112051 ./app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
 2101061639 ./app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
 2101061639 ./app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@@ -3196,7 +3196,7 @@
 2012231444 ./app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
 2101310343 ./app-metrics/collectd/collectd-5.11.0-r3.ebuild
 2101310343 ./app-metrics/collectd/collectd-5.12.0.ebuild
-2102052139 ./app-metrics/collectd/collectd-5.12.0-r1.ebuild
+2102082039 ./app-metrics/collectd/collectd-5.12.0-r1.ebuild
 1912031309 ./app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
 2004090009 ./app-metrics/consul_exporter/consul_exporter-0.6.0.ebuild
 2009130839 ./app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
@@ -4061,6 +4061,7 @@
 2010042009 ./app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
 2012271539 ./app-text/coolreader/coolreader-3.2.51.ebuild
 2012291109 ./app-text/coolreader/coolreader-3.2.50.ebuild
+2102081639 ./app-text/coolreader/coolreader-3.2.53.ebuild
 1912272239 ./app-text/cpdf/cpdf-2.3.1.ebuild
 2012231444 ./app-text/crf++/crf++-0.58.ebuild
 1912110241 ./app-text/crm114/crm114-20100106-r1.ebuild
@@ -4088,11 +4089,11 @@
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
-2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
 2101061709 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+2102082209 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
 2101061709 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
 2101061709 ./app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
 2101061709 ./app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -4151,7 +4152,7 @@
 2101061709 ./app-text/gv/gv-3.7.3.90.ebuild
 2012311940 ./app-text/hd2u/hd2u-1.0.3.ebuild
 2012211309 ./app-text/highlight/highlight-3.57-r1.ebuild
-2101240709 ./app-text/highlight/highlight-3.57-r100.ebuild
+2102081839 ./app-text/highlight/highlight-3.57-r100.ebuild
 2011272109 ./app-text/hnb/hnb-1.9.18-r1.ebuild
 1702282250 ./app-text/htag/htag-0.0.24-r1.ebuild
 2101061709 ./app-text/html-xml-utils/html-xml-utils-7.7.ebuild
@@ -4204,7 +4205,7 @@
 2003170109 ./app-text/libetonyek/libetonyek-9999.ebuild
 2005311909 ./app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
 2012311940 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
-2012112109 ./app-text/libgepub/libgepub-0.6.0.ebuild
+2102082039 ./app-text/libgepub/libgepub-0.6.0.ebuild
 2004032241 ./app-text/libgxps/libgxps-0.3.1.ebuild
 2012102239 ./app-text/liblangtag/liblangtag-0.6.3.ebuild
 1910020309 ./app-text/libmspub/libmspub-9999.ebuild
@@ -4258,7 +4259,7 @@
 2101061709 ./app-text/odt2txt/odt2txt-0.5.ebuild
 2101121311 ./app-text/openjade/openjade-1.3.2-r9.ebuild
 2101061709 ./app-text/opensp/opensp-1.5.2-r3.ebuild
-2101061709 ./app-text/opensp/opensp-1.5.2-r6.ebuild
+2102082209 ./app-text/opensp/opensp-1.5.2-r6.ebuild
 2008011139 ./app-text/pandoc/pandoc-2.9.2.1.ebuild
 2101181209 ./app-text/pandoc/pandoc-2.11.3.1.ebuild
 2101310343 ./app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild
@@ -4292,7 +4293,7 @@
 2012081639 ./app-text/po4a/po4a-0.57.ebuild
 2012082139 ./app-text/po4a/po4a-0.61.ebuild
 2101042109 ./app-text/po4a/po4a-0.61-r1.ebuild
-2101042109 ./app-text/po4a/po4a-0.62.ebuild
+2102082209 ./app-text/po4a/po4a-0.62.ebuild
 2012311940 ./app-text/podofo/podofo-0.9.6_p20190928.ebuild
 2101240709 ./app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
 2101061709 ./app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -4311,7 +4312,7 @@
 2101310343 ./app-text/pytextile/pytextile-3.0.3.ebuild
 2101310343 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
 2101051739 ./app-text/qpdf/qpdf-10.0.4.ebuild
-2101060510 ./app-text/qpdf/qpdf-10.1.0.ebuild
+2102081839 ./app-text/qpdf/qpdf-10.1.0.ebuild
 2101102209 ./app-text/qpdfview/qpdfview-0.4.18.ebuild
 2101102209 ./app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
 2101061709 ./app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -4414,7 +4415,7 @@
 1903092239 ./app-text/xournal/xournal-9999.ebuild
 2002222339 ./app-text/xournal/xournal-0.4.8.2016.ebuild
 2101301309 ./app-text/xpdf/xpdf-4.02-r4.ebuild
-2101301309 ./app-text/xpdf/xpdf-4.03.ebuild
+2102082039 ./app-text/xpdf/xpdf-4.03.ebuild
 2012311940 ./app-text/yelp-tools/yelp-tools-3.32.2.ebuild
 1806302039 ./app-text/yodl/yodl-4.02.01.ebuild
 2006031238 ./app-text/yodl/yodl-4.02.02-r1.ebuild
@@ -7285,13 +7286,14 @@
 2001171339 ./dev-lang/lazarus/lazarus-1.8.4-r2.ebuild
 2004252209 ./dev-lang/lazarus/lazarus-2.0.6.ebuild
 1706031528 ./dev-lang/lfe/lfe-1.1.1.ebuild
+2102082209 ./dev-lang/lfe/lfe-1.3.0_p20210112.ebuild
 2010200809 ./dev-lang/lisaac/lisaac-0.13.1-r2.ebuild
 2006290009 ./dev-lang/logtalk/logtalk-3.36.0.ebuild
 2101062239 ./dev-lang/lua/lua-5.1.5-r4.ebuild
-2101240709 ./dev-lang/lua/lua-5.1.5-r106.ebuild
 2101240709 ./dev-lang/lua/lua-5.2.4-r3.ebuild
-2101240709 ./dev-lang/lua/lua-5.3.6-r2.ebuild
-2101240709 ./dev-lang/lua/lua-5.4.2-r1.ebuild
+2102081839 ./dev-lang/lua/lua-5.1.5-r106.ebuild
+2102081839 ./dev-lang/lua/lua-5.3.6-r2.ebuild
+2102081839 ./dev-lang/lua/lua-5.4.2-r1.ebuild
 2012140439 ./dev-lang/luajit/luajit-2.0.5-r3.ebuild
 2012140439 ./dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
 2011170309 ./dev-lang/maude/maude-2.7.ebuild
@@ -7546,8 +7548,8 @@
 2001091009 ./dev-libs/cppcodec/cppcodec-9999.ebuild
 1904291739 ./dev-libs/crc32c/crc32c-1.0.6.ebuild
 2006270038 ./dev-libs/crossguid/crossguid-0_pre20150817.ebuild
-2012311940 ./dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
-2101021039 ./dev-libs/crypto++/crypto++-8.4.0.ebuild
+2102081809 ./dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+2102081809 ./dev-libs/crypto++/crypto++-8.4.0.ebuild
 2012280039 ./dev-libs/cudnn/cudnn-8.0.5.39.ebuild
 2101270709 ./dev-libs/cvector/cvector-1.0.3.1.ebuild
 2002222009 ./dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -7874,7 +7876,7 @@
 2012311940 ./dev-libs/liblzw/liblzw-0.2-r1.ebuild
 2004032241 ./dev-libs/libmaa/libmaa-1.3.2.ebuild
 2011280039 ./dev-libs/libmanette/libmanette-0.2.5.ebuild
-2012012039 ./dev-libs/libmanette/libmanette-0.2.4.ebuild
+2102082039 ./dev-libs/libmanette/libmanette-0.2.4.ebuild
 2009021909 ./dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
 2009252339 ./dev-libs/libmateweather/libmateweather-1.24.1.ebuild
 2012311940 ./dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
@@ -8160,6 +8162,7 @@
 1912111539 ./dev-libs/pcc-libs/pcc-libs-9999.ebuild
 2011142339 ./dev-libs/pcl/pcl-1.12-r1.ebuild
 2101241709 ./dev-libs/pegtl/pegtl-3.2.0.ebuild
+2102081709 ./dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
 2101310343 ./dev-libs/pigpio/pigpio-76.ebuild
 2101310343 ./dev-libs/pigpio/pigpio-77.ebuild
 2101310343 ./dev-libs/pigpio/pigpio-78.ebuild
@@ -8256,8 +8259,8 @@
 1912110241 ./dev-libs/softhsm/softhsm-2.5.0.ebuild
 2010181839 ./dev-libs/softhsm/softhsm-2.6.1.ebuild
 2101310343 ./dev-libs/sord/sord-0.16.6.ebuild
-2101310343 ./dev-libs/sord/sord-0.16.8.ebuild
 2101310343 ./dev-libs/sord/sord-9999.ebuild
+2102082039 ./dev-libs/sord/sord-0.16.8.ebuild
 2006040108 ./dev-libs/spdlog/spdlog-1.5.0-r1.ebuild
 2009071209 ./dev-libs/spdlog/spdlog-1.7.0.ebuild
 2010261339 ./dev-libs/spdlog/spdlog-9999.ebuild
@@ -8358,9 +8361,9 @@
 1912110241 ./dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
 1912110241 ./dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
 2002151310 ./dev-libs/zthread/zthread-2.3.2-r4.ebuild
-2101090809 ./dev-libs/zziplib/zziplib-0.13.72.ebuild
 2101310343 ./dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
 2101310343 ./dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
+2102081839 ./dev-libs/zziplib/zziplib-0.13.72.ebuild
 1912241139 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2101310343 ./dev-libs/criterion/criterion-2.3.3.ebuild
 2101310343 ./dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -8507,7 +8510,7 @@
 2101240709 ./dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
 2101062239 ./dev-lua/lutok/lutok-0.4-r1.ebuild
 2101062239 ./dev-lua/lutok/lutok-0.4-r2.ebuild
-2101240709 ./dev-lua/lutok/lutok-0.4-r10.ebuild
+2102081839 ./dev-lua/lutok/lutok-0.4-r10.ebuild
 2101230739 ./dev-lua/luv/luv-1.32.0.0-r102.ebuild
 2101240709 ./dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
 2012042039 ./dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
@@ -8521,6 +8524,7 @@
 2101240209 ./dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
 2011301639 ./dev-lua/inifile/inifile-1.0-r100.ebuild
 1912110241 ./dev-ml/alcotest/alcotest-0.8.2.ebuild
+2102082039 ./dev-ml/alcotest/alcotest-1.2.3.ebuild
 2006041239 ./dev-ml/astring/astring-0.8.3.ebuild
 2010180009 ./dev-ml/astring/astring-0.8.5.ebuild
 1709231543 ./dev-ml/async/async-0.9.0.ebuild
@@ -8707,7 +8711,8 @@
 1708100027 ./dev-ml/ocurl/ocurl-0.7.10.ebuild
 2010280709 ./dev-ml/ocurl/ocurl-0.9.1.ebuild
 1912110241 ./dev-ml/opam/opam-1.3.1-r1.ebuild
-2010280709 ./dev-ml/opam/opam-2.0.7.ebuild
+2102082039 ./dev-ml/opam/opam-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam/opam-2.0.8-r1.ebuild
 1702282250 ./dev-ml/optcomp/optcomp-1.6-r1.ebuild
 2010280709 ./dev-ml/ounit/ounit-2.0.6.ebuild
 2010280709 ./dev-ml/parmap/parmap-1.0_rc8.ebuild
@@ -8842,14 +8847,22 @@
 2010280709 ./dev-ml/mccs/mccs-1.1.11.ebuild
 2010280709 ./dev-ml/mmap/mmap-1.0.2.ebuild
 2010280709 ./dev-ml/mmap/mmap-1.1.0.ebuild
-2010280709 ./dev-ml/opam-client/opam-client-2.0.7.ebuild
+2102082039 ./dev-ml/opam-client/opam-client-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-client/opam-client-2.0.8.ebuild
 2101272239 ./dev-ml/opam-core/opam-core-2.0.7.ebuild
+2102082039 ./dev-ml/opam-core/opam-core-2.0.8.ebuild
 2010280709 ./dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
-2101272239 ./dev-ml/opam-format/opam-format-2.0.7.ebuild
-2101272139 ./dev-ml/opam-installer/opam-installer-2.0.7.ebuild
-2010280709 ./dev-ml/opam-repository/opam-repository-2.0.7.ebuild
-2010280709 ./dev-ml/opam-solver/opam-solver-2.0.7.ebuild
-2010280709 ./dev-ml/opam-state/opam-state-2.0.7.ebuild
+2102082039 ./dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
+2102082039 ./dev-ml/opam-format/opam-format-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-format/opam-format-2.0.8.ebuild
+2102082039 ./dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-installer/opam-installer-2.0.8.ebuild
+2102082039 ./dev-ml/opam-repository/opam-repository-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+2102082039 ./dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+2102082039 ./dev-ml/opam-state/opam-state-2.0.7-r1.ebuild
+2102082039 ./dev-ml/opam-state/opam-state-2.0.8.ebuild
 2010280709 ./dev-ml/ounit2/ounit2-2.2.3.ebuild
 2102081109 ./dev-ml/ounit2/ounit2-2.2.4.ebuild
 2010280709 ./dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -10314,7 +10327,7 @@
 1912110241 ./dev-perl/Roman/Roman-1.240.0.ebuild
 2004032241 ./dev-perl/Router-Simple/Router-Simple-0.170.0.ebuild
 1809150539 ./dev-perl/SDL/SDL-2.546.ebuild
-2101070139 ./dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+2102082209 ./dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
 2012311940 ./dev-perl/SNMP_Session/SNMP_Session-1.13-r2.ebuild
 2006222209 ./dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
 1912110241 ./dev-perl/SOAP-WSDL/SOAP-WSDL-3.3.0.ebuild
@@ -10550,7 +10563,7 @@
 2101070139 ./dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r1.ebuild
 2101070139 ./dev-perl/Text-CSV/Text-CSV-1.950.0.ebuild
 2101070139 ./dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
-2101070139 ./dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
+2102082209 ./dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
 2101070139 ./dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
 1912110241 ./dev-perl/Text-FindIndent/Text-FindIndent-0.110.0.ebuild
 1912110241 ./dev-perl/Text-Format/Text-Format-0.600.0.ebuild
@@ -10578,7 +10591,7 @@
 1912110241 ./dev-perl/Text-VimColor/Text-VimColor-0.280.0.ebuild
 1912110241 ./dev-perl/Text-VimColor/Text-VimColor-0.290.0-r1.ebuild
 2101070139 ./dev-perl/Text-WikiFormat/Text-WikiFormat-0.810.0.ebuild
-2101070139 ./dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
+2102082209 ./dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
 2012311940 ./dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
 1912110241 ./dev-perl/Text-vFile-asData/Text-vFile-asData-0.80.0.ebuild
 1804070808 ./dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild
@@ -11539,7 +11552,7 @@
 2101261309 ./dev-python/construct/construct-2.10.57.ebuild
 2101281139 ./dev-python/construct/construct-2.10.58.ebuild
 2101310343 ./dev-python/construct/construct-2.10.56.ebuild
-2102071209 ./dev-python/construct/construct-2.10.59.ebuild
+2102081839 ./dev-python/construct/construct-2.10.59.ebuild
 2101310343 ./dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
 2101310343 ./dev-python/cookies/cookies-2.2.1-r1.ebuild
 2101310343 ./dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -11557,7 +11570,7 @@
 2102021209 ./dev-python/croniter/croniter-1.0.6.ebuild
 2101310343 ./dev-python/cryptography/cryptography-3.2.1.ebuild
 2101310343 ./dev-python/cryptography/cryptography-3.3.1.ebuild
-2102081209 ./dev-python/cryptography/cryptography-3.3.2.ebuild
+2102082039 ./dev-python/cryptography/cryptography-3.3.2.ebuild
 2101310343 ./dev-python/css-parser/css-parser-1.0.4-r1.ebuild
 2101310343 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
 2101310343 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
@@ -11920,6 +11933,7 @@
 2101171209 ./dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
 2101311209 ./dev-python/jsonpickle/jsonpickle-1.5.1.ebuild
 2102081209 ./dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
+2102081839 ./dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
 2101310343 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
 2101310343 ./dev-python/jsonref/jsonref-0.1.ebuild
 2101310343 ./dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
@@ -13197,7 +13211,7 @@
 2101310343 ./dev-python/tubes/tubes-0.2.0-r1.ebuild
 2101310343 ./dev-python/asteval/asteval-0.9.21.ebuild
 2101310343 ./dev-python/lmfit/lmfit-1.0.1.ebuild
-2102081209 ./dev-python/lmfit/lmfit-1.0.2.ebuild
+2102081839 ./dev-python/lmfit/lmfit-1.0.2.ebuild
 2101310343 ./dev-python/argparse-manpage/argparse-manpage-1.4.ebuild
 2101310343 ./dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
 2101310343 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
@@ -13310,6 +13324,7 @@
 2101240239 ./dev-python/backrefs/backrefs-5.0.1.ebuild
 2012080909 ./dev-python/bracex/bracex-2.0.1.ebuild
 2102071209 ./dev-python/bracex/bracex-2.1.0.ebuild
+2102081909 ./dev-python/bracex/bracex-2.1.1.ebuild
 2012080909 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
 2012080909 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
 2012080909 ./dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
@@ -15048,8 +15063,8 @@
 2102061009 ./dev-ruby/nio4r/nio4r-2.5.5.ebuild
 2101062139 ./dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
 2101062139 ./dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
-2101101139 ./dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
 2102071939 ./dev-ruby/nokogiri/nokogiri-1.11.1-r2.ebuild
+2102082039 ./dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
@@ -16223,7 +16238,7 @@
 2102061309 ./dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
 2004202139 ./dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
 2012311940 ./dev-util/gob/gob-2.0.20.ebuild
-2012182139 ./dev-util/goland/goland-2020.3.ebuild
+2102081839 ./dev-util/goland/goland-2020.3.2.ebuild
 2008210639 ./dev-util/google-perftools/google-perftools-2.8.ebuild
 2008210939 ./dev-util/google-perftools/google-perftools-2.7-r1.ebuild
 2001211409 ./dev-util/gource/gource-0.51.ebuild
@@ -16389,7 +16404,7 @@
 2101310343 ./dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
 2101310343 ./dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
 2101292239 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
-2102042039 ./dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+2102081839 ./dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
 2007131839 ./dev-util/pkgconf/pkgconf-1.7.2.ebuild
 2011142339 ./dev-util/pkgconf/pkgconf-1.6.3.ebuild
 2011252124 ./dev-util/pkgconf/pkgconf-9999.ebuild
@@ -17934,8 +17949,8 @@
 2008051739 ./gui-libs/wlroots/wlroots-0.11.0.ebuild
 2011112009 ./gui-libs/wlroots/wlroots-9999.ebuild
 2012112109 ./gui-libs/wlroots/wlroots-0.12.0.ebuild
-2012032139 ./gui-libs/libwpe/libwpe-1.8.0.ebuild
-2012032139 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+2102082039 ./gui-libs/libwpe/libwpe-1.8.0.ebuild
+2102082039 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
 2008070639 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
 2011140009 ./gui-libs/wf-config/wf-config-0.6.0.ebuild
 2011140009 ./gui-libs/wf-config/wf-config-9999.ebuild
@@ -18744,7 +18759,7 @@
 2101040639 ./mail-client/bower/bower-0.12.ebuild
 2008221109 ./mail-client/claws-mail/claws-mail-9999.ebuild
 2012030239 ./mail-client/claws-mail/claws-mail-3.17.8.ebuild
-2102061639 ./mail-client/claws-mail/claws-mail-3.17.7.ebuild
+2102082039 ./mail-client/claws-mail/claws-mail-3.17.7.ebuild
 1912031639 ./mail-client/clawsker/clawsker-1.3.1.ebuild
 2006062109 ./mail-client/clawsker/clawsker-1.1.0.ebuild
 1904121039 ./mail-client/cone/cone-1.0.ebuild
@@ -19229,6 +19244,7 @@
 2012241639 ./media-gfx/darktable/darktable-3.2.1-r1.ebuild
 2012270239 ./media-gfx/darktable/darktable-9999.ebuild
 2102030639 ./media-gfx/darktable/darktable-3.4.0-r1.ebuild
+2102081709 ./media-gfx/darktable/darktable-3.4.1.ebuild
 1805191409 ./media-gfx/dawn/dawn-3.90b-r1.ebuild
 2012311940 ./media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
 2012060309 ./media-gfx/digikam/digikam-7.1.0-r1.ebuild
@@ -19298,6 +19314,7 @@
 2101310343 ./media-gfx/gimp/gimp-9999.ebuild
 2011090239 ./media-gfx/gmic/gmic-2.9.2-r1.ebuild
 2102041139 ./media-gfx/gmic/gmic-2.9.4.ebuild
+2102081709 ./media-gfx/gmic/gmic-2.9.5.ebuild
 2101310343 ./media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
 2101310343 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2004202139 ./media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
@@ -19425,7 +19442,7 @@
 2007210509 ./media-gfx/plantuml/plantuml-1.2020.0.ebuild
 1702282250 ./media-gfx/png2ico/png2ico-2002.12.08.ebuild
 1810271909 ./media-gfx/pngcheck/pngcheck-2.3.0.ebuild
-2102020139 ./media-gfx/pngcheck/pngcheck-3.0.2.ebuild
+2102082039 ./media-gfx/pngcheck/pngcheck-3.0.2.ebuild
 2101061739 ./media-gfx/pngcrush/pngcrush-1.8.13.ebuild
 1702282250 ./media-gfx/pngnq/pngnq-1.1.ebuild
 1911201439 ./media-gfx/pngquant/pngquant-2.12.3.ebuild
@@ -19602,7 +19619,7 @@
 2012311940 ./media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
 2008182039 ./media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
 2101310343 ./media-libs/ganv/ganv-1.6.0-r1.ebuild
-2101310343 ./media-libs/ganv/ganv-1.8.0.ebuild
+2102082039 ./media-libs/ganv/ganv-1.8.0.ebuild
 2012311940 ./media-libs/gavl/gavl-1.4.0-r1.ebuild
 2102011839 ./media-libs/gavl/gavl-1.4.0-r2.ebuild
 2101262039 ./media-libs/gd/gd-2.3.0.ebuild
@@ -19689,7 +19706,7 @@
 2101091409 ./media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
 2101091409 ./media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
 2101061739 ./media-libs/lcms/lcms-2.11.ebuild
-2102062039 ./media-libs/lcms/lcms-2.12.ebuild
+2102081809 ./media-libs/lcms/lcms-2.12.ebuild
 2101310343 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
 2002151310 ./media-libs/leptonica/leptonica-1.74.4.ebuild
 2008190209 ./media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -19869,7 +19886,7 @@
 2101240709 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
 2101240709 ./media-libs/libquvi/libquvi-0.9.4-r100.ebuild
 2010161509 ./media-libs/libraw/libraw-0.20.0.ebuild
-2010161509 ./media-libs/libraw/libraw-0.20.2.ebuild
+2102082039 ./media-libs/libraw/libraw-0.20.2.ebuild
 2101061739 ./media-libs/libreplaygain/libreplaygain-477-r1.ebuild
 2012272109 ./media-libs/librosprite/librosprite-0.1.3-r2.ebuild
 2101061739 ./media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -19925,7 +19942,7 @@
 2102061339 ./media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
 2102061339 ./media-libs/lsp-plugins/lsp-plugins-9999.ebuild
 2101310343 ./media-libs/lv2/lv2-1.18.0.ebuild
-2101310343 ./media-libs/lv2/lv2-1.18.2.ebuild
+2102082039 ./media-libs/lv2/lv2-1.18.2.ebuild
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
 2004032241 ./media-libs/memphis/memphis-0.2.3.ebuild
 2101310343 ./media-libs/mesa/mesa-20.2.6.ebuild
@@ -20374,8 +20391,7 @@
 2010191639 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
 2101170339 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.2.2.ebuild
 2010011639 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
-2012070439 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
-2101061809 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.2.0.ebuild
+2102081739 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.4.0.ebuild
 2008020439 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
 2008030439 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.1.ebuild
 2010312339 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.0.0.ebuild
@@ -20447,7 +20463,7 @@
 2101061739 ./media-plugins/live/live-2020.05.15.ebuild
 1912221509 ./media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
 2101310343 ./media-plugins/mda-lv2/mda-lv2-1.2.4.ebuild
-2101310343 ./media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild
+2102082039 ./media-plugins/mda-lv2/mda-lv2-1.2.6.ebuild
 2009202339 ./media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.4.0.ebuild
 1803140138 ./media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild
 1912111539 ./media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild
@@ -20839,7 +20855,7 @@
 2101310343 ./media-sound/jack2/jack2-1.9.17.ebuild
 2101310343 ./media-sound/jack2/jack2-9999.ebuild
 2102081209 ./media-sound/jalv/jalv-1.6.4.ebuild
-2102081209 ./media-sound/jalv/jalv-1.6.6.ebuild
+2102082039 ./media-sound/jalv/jalv-1.6.6.ebuild
 2008082339 ./media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
 1911101439 ./media-sound/justeport/justeport-0.2.ebuild
 2011040409 ./media-sound/kid3/kid3-3.8.4.ebuild
@@ -20951,7 +20967,7 @@
 1810042239 ./media-sound/pasystray/pasystray-0.7.0.ebuild
 1903170109 ./media-sound/pasystray/pasystray-0.7.1.ebuild
 2008291539 ./media-sound/patchage/patchage-1.0.2.ebuild
-2101141409 ./media-sound/patchage/patchage-1.0.4.ebuild
+2102082039 ./media-sound/patchage/patchage-1.0.4.ebuild
 2007311939 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
 2101240209 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.16.0.ebuild
 2002231739 ./media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -21144,7 +21160,7 @@
 2012151909 ./media-sound/scream/scream-9999.ebuild
 2101230339 ./media-sound/kmidimon/kmidimon-1.0.0.ebuild
 2101220839 ./media-sound/aucatctl/aucatctl-0.1.ebuild
-2101220839 ./media-sound/sndio/sndio-1.7.0.ebuild
+2102081839 ./media-sound/sndio/sndio-1.7.0.ebuild
 2005181609 ./media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -22583,8 +22599,8 @@
 1912110241 ./net-libs/wandio/wandio-4.2.1.ebuild
 2005260939 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2101310343 ./net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
-2101310343 ./net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
 2101310343 ./net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
+2102082039 ./net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 2012311940 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2009182109 ./net-libs/xrootd/xrootd-5.0.2.ebuild
@@ -22735,7 +22751,7 @@
 2005271109 ./net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
 2008010009 ./net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
 2002230040 ./net-mail/vqadmin/vqadmin-2.3.7.ebuild
-2102061639 ./net-mail/ytnef/ytnef-1.9.3.ebuild
+2102082039 ./net-mail/ytnef/ytnef-1.9.3.ebuild
 2005112009 ./net-mail/automx2/automx2-2020.1-r1.ebuild
 2012300039 ./net-mail/automx2/automx2-2020.2.ebuild
 2101092209 ./net-mail/automx2/automx2-2021.0.ebuild
@@ -22808,7 +22824,8 @@
 1903250839 ./net-misc/cgminer/cgminer-4.10.0.ebuild
 1903250839 ./net-misc/cgminer/cgminer-4.9.2.ebuild
 2102051409 ./net-misc/chrony/chrony-4.0.ebuild
-2102051409 ./net-misc/chrony/chrony-9999.ebuild
+2102081839 ./net-misc/chrony/chrony-4.0-r1.ebuild
+2102081839 ./net-misc/chrony/chrony-9999.ebuild
 2009131039 ./net-misc/clockspeed/clockspeed-0.62-r7.ebuild
 1912110241 ./net-misc/clusterssh/clusterssh-4.03.03.ebuild
 1912110241 ./net-misc/clusterssh/clusterssh-4.30.600.ebuild
@@ -22827,9 +22844,11 @@
 1702282250 ./net-misc/connman-ui/connman-ui-9999.ebuild
 2001281709 ./net-misc/connman/connman-9999.ebuild
 2004052339 ./net-misc/connman/connman-1.38.ebuild
+2102081909 ./net-misc/connman/connman-1.39-r1.ebuild
+2102081809 ./net-misc/connman/connman-1.39.ebuild
 1912110241 ./net-misc/csync/csync-0.50.0-r1.ebuild
 2101071139 ./net-misc/curl/curl-7.74.0-r2.ebuild
-2102010309 ./net-misc/curl/curl-7.74.0-r4.ebuild
+2102081939 ./net-misc/curl/curl-7.74.0-r4.ebuild
 2007201539 ./net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
 2101241139 ./net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
 2008081539 ./net-misc/dahdi/dahdi-3.1.0-r2.ebuild
@@ -23408,6 +23427,7 @@
 2101112239 ./net-p2p/rtorrent/rtorrent-0.9.8.ebuild
 2011140439 ./net-p2p/syncthing/syncthing-1.10.0.ebuild
 2101191739 ./net-p2p/syncthing/syncthing-1.12.1.ebuild
+2102081809 ./net-p2p/syncthing/syncthing-1.13.1.ebuild
 1805290208 ./net-p2p/syrep/syrep-0.9.ebuild
 2101310343 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
 2012160709 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -23519,7 +23539,7 @@
 1702282250 ./net-proxy/polipo/polipo-9999.ebuild
 2009071209 ./net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
 2101310639 ./net-proxy/privoxy/privoxy-3.0.29.ebuild
-2101310639 ./net-proxy/privoxy/privoxy-3.0.31.ebuild
+2102082039 ./net-proxy/privoxy/privoxy-3.0.31.ebuild
 1912111540 ./net-proxy/redsocks/redsocks-0.5.ebuild
 1912111540 ./net-proxy/redsocks/redsocks-9999.ebuild
 2002082109 ./net-proxy/redsocks/redsocks-0.5-r1.ebuild
@@ -24355,6 +24375,7 @@
 2002230040 ./sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
 2006040939 ./sci-geosciences/gpxsee/gpxsee-7.29.ebuild
 2101061339 ./sci-geosciences/gpxsee/gpxsee-8.1.ebuild
+2102081639 ./sci-geosciences/gpxsee/gpxsee-8.4.ebuild
 1805212239 ./sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
 1805212239 ./sci-geosciences/gshhs/gshhs-1.13.ebuild
 1910261809 ./sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -24415,6 +24436,7 @@
 2002112051 ./sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
 2005050939 ./sci-geosciences/opencpn/opencpn-5.0.0.ebuild
 2006270039 ./sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+2102081709 ./sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
 2012211339 ./sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
 2012231509 ./sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
 2101041839 ./sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -24630,9 +24652,11 @@
 2008081539 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
 2008081539 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
 2008081539 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
+2102082209 ./sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
 2101310343 ./sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
 2101310343 ./sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
 2101310343 ./sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
+2102082209 ./sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
 1902270739 ./sci-libs/lis/lis-1.6.5.ebuild
 1907282339 ./sci-libs/lmfit/lmfit-8.2.2.ebuild
 2002230040 ./sci-libs/lrslib/lrslib-062.ebuild
@@ -25546,7 +25570,7 @@
 2101121909 ./sys-apps/bleachbit/bleachbit-4.2.0.ebuild
 2101310343 ./sys-apps/bleachbit/bleachbit-4.0.0.ebuild
 2101192109 ./sys-apps/bolt/bolt-0.9-r2.ebuild
-2007292309 ./sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+2102082039 ./sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
 2011021509 ./sys-apps/busybox/busybox-9999.ebuild
 2101060224 ./sys-apps/busybox/busybox-1.33.0.ebuild
 2101091939 ./sys-apps/busybox/busybox-1.32.0-r1.ebuild
@@ -25981,9 +26005,9 @@
 2009200309 ./sys-apps/syslog-notify/syslog-notify-0.2.ebuild
 1810211839 ./sys-apps/systemd-readahead/systemd-readahead-216.ebuild
 2101310343 ./sys-apps/systemd/systemd-246-r2.ebuild
-2101310343 ./sys-apps/systemd/systemd-246.6.ebuild
-2101310343 ./sys-apps/systemd/systemd-247.2-r4.ebuild
-2101310343 ./sys-apps/systemd/systemd-9999.ebuild
+2102081939 ./sys-apps/systemd/systemd-246.6.ebuild
+2102081939 ./sys-apps/systemd/systemd-247.2-r4.ebuild
+2102081939 ./sys-apps/systemd/systemd-9999.ebuild
 2005021439 ./sys-apps/sysvinit/sysvinit-2.93.ebuild
 2011101439 ./sys-apps/sysvinit/sysvinit-2.96.ebuild
 2011171209 ./sys-apps/sysvinit/sysvinit-2.98.ebuild
@@ -26055,10 +26079,10 @@
 1912071909 ./sys-apps/edid-decode/edid-decode-9999.ebuild
 2102072039 ./sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
 2008272109 ./sys-apps/pnputils/pnputils-0.1.ebuild
-2010091139 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
-2002222009 ./sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
-2101312039 ./sys-apps/usbguard/usbguard-0.7.8.ebuild
-2101312039 ./sys-apps/usbguard/usbguard-1.0.0.ebuild
+2102082039 ./sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+2102081709 ./sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+2102081709 ./sys-apps/usbguard/usbguard-0.7.8.ebuild
+2102081709 ./sys-apps/usbguard/usbguard-1.0.0.ebuild
 2009212109 ./sys-apps/earlyoom/earlyoom-1.3.ebuild
 2009212109 ./sys-apps/earlyoom/earlyoom-1.6.1.ebuild
 2009212109 ./sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -27477,7 +27501,7 @@
 2101310343 ./sys-libs/tevent/tevent-0.10.2.ebuild
 2101271039 ./sys-libs/timezone-data/timezone-data-2021a.ebuild
 2102051539 ./sys-libs/timezone-data/timezone-data-2020e.ebuild
-2102060309 ./sys-libs/timezone-data/timezone-data-2020f.ebuild
+2102081839 ./sys-libs/timezone-data/timezone-data-2020f.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -27550,7 +27574,7 @@
 2012251639 ./sys-process/atop/atop-2.6.0.ebuild
 2012311940 ./sys-process/atop/atop-2.3.0-r1.ebuild
 2101310343 ./sys-process/audit/audit-2.8.5-r2.ebuild
-2102080939 ./sys-process/audit/audit-3.0.ebuild
+2102081839 ./sys-process/audit/audit-3.0.ebuild
 2101310343 ./sys-process/bcron/bcron-0.11.ebuild
 2101310343 ./sys-process/criu/criu-3.14-r2.ebuild
 2101310343 ./sys-process/criu/criu-3.15.ebuild
@@ -27933,6 +27957,7 @@
 1706121125 ./www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
 2101310343 ./www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
 2101310343 ./www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
+2102081709 ./www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
 2009260639 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
@@ -28180,6 +28205,7 @@
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
 2012261209 ./www-plugins/lightspark/lightspark-0.8.3.ebuild
+2102081839 ./www-plugins/lightspark/lightspark-0.8.4.ebuild
 2101310343 ./www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
 2006171439 ./www-plugins/pdfjs/pdfjs-2.4.456.ebuild
 2011232139 ./www-plugins/pdfjs/pdfjs-2.5.207.ebuild
@@ -28669,7 +28695,7 @@
 2002271409 ./x11-misc/grsync/grsync-1.2.6.ebuild
 2009201709 ./x11-misc/grsync/grsync-1.2.8.ebuild
 2012041209 ./x11-misc/grsync/grsync-1.3.0.ebuild
-2101310343 ./x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
+2102081639 ./x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.ebuild
 1910111911 ./x11-misc/grun/grun-0.9.3-r1.ebuild
 1702282250 ./x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild
 2009161239 ./x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -29642,7 +29668,7 @@
 2012231139 ./xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.0.ebuild
 2102080939 ./xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild
 1912312009 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
-2102080409 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.1.ebuild
+2102082209 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
 2101030239 ./xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.4.0.ebuild
 1912061739 ./xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r4.ebuild
 2012202339 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
@@ -32642,10 +32668,10 @@
 2101231224 metadata/md5-cache/app-eselect/eselect-vi-1.2
 2101231224 metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
 2101231224 metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
-2101240709 metadata/md5-cache/app-eselect/eselect-lua-4-r1
 2101251939 metadata/md5-cache/app-eselect/eselect-pinentry-0.7.1
-2101310343 metadata/md5-cache/app-eselect/Manifest.gz
 2101310343 metadata/md5-cache/app-eselect/eselect-repository-8
+2102081839 metadata/md5-cache/app-eselect/Manifest.gz
+2102081839 metadata/md5-cache/app-eselect/eselect-lua-4-r1
 1905191439 metadata/md5-cache/app-forensics/air-2.0.0-r2
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
@@ -32962,8 +32988,8 @@
 2101231224 metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
 2101310343 metadata/md5-cache/app-metrics/collectd-5.11.0-r3
 2101310343 metadata/md5-cache/app-metrics/collectd-5.12.0
-2102052139 metadata/md5-cache/app-metrics/Manifest.gz
-2102052139 metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+2102082039 metadata/md5-cache/app-metrics/Manifest.gz
+2102082039 metadata/md5-cache/app-metrics/collectd-5.12.0-r1
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 1805212239 metadata/md5-cache/app-misc/aldo-0.7.7
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
@@ -33806,14 +33832,12 @@
 2012311940 metadata/md5-cache/app-text/xapian-omega-1.4.17
 2101040510 metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.79.1
 2101042109 metadata/md5-cache/app-text/po4a-0.61-r1
-2101042109 metadata/md5-cache/app-text/po4a-0.62
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2101061709 metadata/md5-cache/app-text/catdoc-0.95-r1
 2101061709 metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r4
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r4
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r4
-2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r3
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r3
 2101061709 metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r1
@@ -33840,7 +33864,6 @@
 2101061709 metadata/md5-cache/app-text/poppler-data-0.4.10
 2101061709 metadata/md5-cache/app-text/ps2pkm-1.8_p20200406
 2101051739 metadata/md5-cache/app-text/qpdf-10.0.4
-2101060510 metadata/md5-cache/app-text/qpdf-10.1.0
 2101061709 metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1
 2101061709 metadata/md5-cache/app-text/sgml-common-0.6.3-r7
 2101061709 metadata/md5-cache/app-text/sgrep-1.94a
@@ -33994,7 +34017,6 @@
 2101231224 metadata/md5-cache/app-text/odt2txt-0.5
 2101231224 metadata/md5-cache/app-text/openjade-1.3.2-r9
 2101231224 metadata/md5-cache/app-text/opensp-1.5.2-r3
-2101231224 metadata/md5-cache/app-text/opensp-1.5.2-r6
 2101231224 metadata/md5-cache/app-text/paps-0.6.8-r2
 2101231224 metadata/md5-cache/app-text/par-1.52-r1
 2101231224 metadata/md5-cache/app-text/par-1.53.0
@@ -34076,7 +34098,6 @@
 2101231224 metadata/md5-cache/app-text/yodl-4.02.02-r1
 2101231224 metadata/md5-cache/app-text/yodl-4.03.00
 2101242039 metadata/md5-cache/app-text/build-docbook-catalog-1.21
-2101240709 metadata/md5-cache/app-text/highlight-3.57-r100
 2101241639 metadata/md5-cache/app-text/htmldoc-1.9.11-r1
 2101240709 metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
 2101241539 metadata/md5-cache/app-text/sword-1.9.0-r1
@@ -34101,7 +34122,6 @@
 2101310343 metadata/md5-cache/app-text/gtranslator-3.36.0
 2101310343 metadata/md5-cache/app-text/iso-codes-4.4
 2101310343 metadata/md5-cache/app-text/iso-codes-4.5.0
-2101310343 metadata/md5-cache/app-text/libgepub-0.6.0
 2101310343 metadata/md5-cache/app-text/libgxps-0.3.1
 2101301309 metadata/md5-cache/app-text/pandoc-2.11.3.1
 2101301309 metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -34112,7 +34132,6 @@
 2101310343 metadata/md5-cache/app-text/wiki2beamer-0.10.0
 2101312309 metadata/md5-cache/app-text/xmlstarlet-1.6.1
 2101301309 metadata/md5-cache/app-text/xpdf-4.02-r4
-2101301309 metadata/md5-cache/app-text/xpdf-4.03
 2101310343 metadata/md5-cache/app-text/zathura-0.4.3
 2101310343 metadata/md5-cache/app-text/zathura-0.4.4
 2101310343 metadata/md5-cache/app-text/zathura-0.4.5
@@ -34174,7 +34193,6 @@
 2102042210 metadata/md5-cache/app-text/xlsx2csv-0.7.6
 2102042210 metadata/md5-cache/app-text/xmldiff-2.3
 2102042210 metadata/md5-cache/app-text/xmldiff-2.4
-2102081239 metadata/md5-cache/app-text/Manifest.gz
 2102081239 metadata/md5-cache/app-text/ansifilter-2.18
 2102060339 metadata/md5-cache/app-text/dvipng-1.17
 2102060339 metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -34184,6 +34202,15 @@
 2102080939 metadata/md5-cache/app-text/recode-3.7.8
 2102071939 metadata/md5-cache/app-text/ronn-0.7.3-r3
 2102071939 metadata/md5-cache/app-text/webgen-1.7.1
+2102082209 metadata/md5-cache/app-text/Manifest.gz
+2102081639 metadata/md5-cache/app-text/coolreader-3.2.53
+2102082209 metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
+2102081839 metadata/md5-cache/app-text/highlight-3.57-r100
+2102082039 metadata/md5-cache/app-text/libgepub-0.6.0
+2102082209 metadata/md5-cache/app-text/opensp-1.5.2-r6
+2102082209 metadata/md5-cache/app-text/po4a-0.62
+2102081839 metadata/md5-cache/app-text/qpdf-10.1.0
+2102082039 metadata/md5-cache/app-text/xpdf-4.03
 2012281255 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2012281255 metadata/md5-cache/app-vim/airline-0.11
 2012281255 metadata/md5-cache/app-vim/airline-9999
@@ -37137,10 +37164,7 @@
 2101231224 metadata/md5-cache/dev-lang/zig-0.5.0
 2101231224 metadata/md5-cache/dev-lang/zig-9999
 2101250539 metadata/md5-cache/dev-lang/erlang-23.2
-2101240709 metadata/md5-cache/dev-lang/lua-5.1.5-r106
 2101240709 metadata/md5-cache/dev-lang/lua-5.2.4-r3
-2101240709 metadata/md5-cache/dev-lang/lua-5.3.6-r2
-2101240709 metadata/md5-cache/dev-lang/lua-5.4.2-r1
 2101260309 metadata/md5-cache/dev-lang/perl-5.32.1
 2101251739 metadata/md5-cache/dev-lang/php-7.3.26
 2101251739 metadata/md5-cache/dev-lang/php-7.4.14
@@ -37185,7 +37209,6 @@
 2102042210 metadata/md5-cache/dev-lang/php-7.3.27
 2102042210 metadata/md5-cache/dev-lang/php-7.4.15
 2102042210 metadata/md5-cache/dev-lang/php-8.0.2
-2102061609 metadata/md5-cache/dev-lang/Manifest.gz
 2102051339 metadata/md5-cache/dev-lang/crystal-0.36.1
 2102051839 metadata/md5-cache/dev-lang/elixir-1.11.3
 2102051839 metadata/md5-cache/dev-lang/erlang-23.2.1
@@ -37202,6 +37225,11 @@
 2102061609 metadata/md5-cache/dev-lang/spidermonkey-78.6.0
 2102061609 metadata/md5-cache/dev-lang/spidermonkey-78.7.1
 2102051839 metadata/md5-cache/dev-lang/swi-prolog-8.3.18
+2102082209 metadata/md5-cache/dev-lang/Manifest.gz
+2102082209 metadata/md5-cache/dev-lang/lfe-1.3.0_p20210112
+2102081839 metadata/md5-cache/dev-lang/lua-5.1.5-r106
+2102081839 metadata/md5-cache/dev-lang/lua-5.3.6-r2
+2102081839 metadata/md5-cache/dev-lang/lua-5.4.2-r1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1908180639 metadata/md5-cache/dev-libs/darts-0.32
 1702282313 metadata/md5-cache/dev-libs/libb64-1.2.1
@@ -37376,8 +37404,6 @@
 2101231224 metadata/md5-cache/dev-libs/cppcodec-9999
 2101231224 metadata/md5-cache/dev-libs/crc32c-1.0.6
 2101231224 metadata/md5-cache/dev-libs/crossguid-0_pre20150817
-2101231224 metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
-2101231224 metadata/md5-cache/dev-libs/crypto++-8.4.0
 2101231224 metadata/md5-cache/dev-libs/cxxopts-2.2.1-r1
 2101231224 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p14-r2
 2101231224 metadata/md5-cache/dev-libs/d0_blind_id-0.5
@@ -38048,7 +38074,6 @@
 2101310343 metadata/md5-cache/dev-libs/libjcat-0.1.3
 2101310343 metadata/md5-cache/dev-libs/libjcat-0.1.4
 2101310343 metadata/md5-cache/dev-libs/libjcat-0.1.5
-2101310343 metadata/md5-cache/dev-libs/libmanette-0.2.4
 2101310343 metadata/md5-cache/dev-libs/libmanette-0.2.5
 2101310343 metadata/md5-cache/dev-libs/liborcus-0.15.4
 2101310343 metadata/md5-cache/dev-libs/liborcus-9999
@@ -38091,7 +38116,6 @@
 2101310343 metadata/md5-cache/dev-libs/serd-0.30.6
 2101310343 metadata/md5-cache/dev-libs/serd-0.30.8
 2101310343 metadata/md5-cache/dev-libs/sord-0.16.6
-2101310343 metadata/md5-cache/dev-libs/sord-0.16.8
 2101310343 metadata/md5-cache/dev-libs/sord-9999
 2101310343 metadata/md5-cache/dev-libs/stfl-0.24-r2
 2101310343 metadata/md5-cache/dev-libs/stfl-0.24-r3
@@ -38112,7 +38136,6 @@
 2101310343 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
 2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
 2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.71_p20201021
-2101310343 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2102011839 metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
 2102011639 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2102011639 metadata/md5-cache/dev-libs/granite-5.5.0
@@ -38151,7 +38174,6 @@
 2102042210 metadata/md5-cache/dev-libs/pigpio-76
 2102042210 metadata/md5-cache/dev-libs/pigpio-77
 2102042210 metadata/md5-cache/dev-libs/pigpio-78
-2102080939 metadata/md5-cache/dev-libs/Manifest.gz
 2102072239 metadata/md5-cache/dev-libs/elfutils-0.183
 2102070039 metadata/md5-cache/dev-libs/libcbor-0.8.0
 2102080939 metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
@@ -38172,6 +38194,13 @@
 2102060439 metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
 2102051839 metadata/md5-cache/dev-libs/uriparser-0.9.4
 2102060309 metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2
+2102082039 metadata/md5-cache/dev-libs/Manifest.gz
+2102081809 metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
+2102081809 metadata/md5-cache/dev-libs/crypto++-8.4.0
+2102082039 metadata/md5-cache/dev-libs/libmanette-0.2.4
+2102081709 metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
+2102082039 metadata/md5-cache/dev-libs/sord-0.16.8
+2102081839 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2012231444 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2101231224 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2101231224 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -38249,13 +38278,13 @@
 2101240709 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
 2101240709 metadata/md5-cache/dev-lua/luassert-1.8.0-r101
 2101240709 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
-2101240709 metadata/md5-cache/dev-lua/lutok-0.4-r10
 2101240709 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
 2101240709 metadata/md5-cache/dev-lua/penlight-1.9.2-r101
 2101240709 metadata/md5-cache/dev-lua/say-1.3_p1-r101
 2101240709 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
 2101272209 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
-2101272339 metadata/md5-cache/dev-lua/Manifest.gz
+2102081839 metadata/md5-cache/dev-lua/Manifest.gz
+2102081839 metadata/md5-cache/dev-lua/lutok-0.4-r10
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -38330,11 +38359,6 @@
 2101240009 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
 2101240009 metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
 2101240009 metadata/md5-cache/dev-ml/octavius-1.2.2
-2101240009 metadata/md5-cache/dev-ml/opam-2.0.7
-2101240009 metadata/md5-cache/dev-ml/opam-client-2.0.7
-2101240009 metadata/md5-cache/dev-ml/opam-repository-2.0.7
-2101240009 metadata/md5-cache/dev-ml/opam-solver-2.0.7
-2101240009 metadata/md5-cache/dev-ml/opam-state-2.0.7
 2101240009 metadata/md5-cache/dev-ml/ounit2-2.2.3
 2101240009 metadata/md5-cache/dev-ml/parmap-1.1.1
 2101240009 metadata/md5-cache/dev-ml/parmap-1.2
@@ -38570,8 +38594,6 @@
 2101272239 metadata/md5-cache/dev-ml/lablgtk-3.1.1
 2101272239 metadata/md5-cache/dev-ml/ocamlnet-4.1.8
 2101272239 metadata/md5-cache/dev-ml/opam-core-2.0.7
-2101272239 metadata/md5-cache/dev-ml/opam-format-2.0.7
-2101272139 metadata/md5-cache/dev-ml/opam-installer-2.0.7
 2101271809 metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
 2101272239 metadata/md5-cache/dev-ml/re-1.9.0
 2101282339 metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -38607,7 +38629,6 @@
 2102040009 metadata/md5-cache/dev-ml/ocamlbuild-0.10.1
 2102042210 metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
 2102042210 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
-2102081109 metadata/md5-cache/dev-ml/Manifest.gz
 2102081109 metadata/md5-cache/dev-ml/cinaps-0.15.0
 2102060209 metadata/md5-cache/dev-ml/graphics-5.1.1
 2102070109 metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
@@ -38616,6 +38637,24 @@
 2102081109 metadata/md5-cache/dev-ml/ounit2-2.2.4
 2102081109 metadata/md5-cache/dev-ml/ppxlib-0.22.0
 2102081109 metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
+2102082039 metadata/md5-cache/dev-ml/Manifest.gz
+2102082039 metadata/md5-cache/dev-ml/alcotest-1.2.3
+2102082039 metadata/md5-cache/dev-ml/opam-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-2.0.8-r1
+2102082039 metadata/md5-cache/dev-ml/opam-client-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-client-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-core-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-file-format-2.1.2
+2102082039 metadata/md5-cache/dev-ml/opam-format-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-format-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-installer-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-installer-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-repository-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-repository-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-solver-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-solver-2.0.8
+2102082039 metadata/md5-cache/dev-ml/opam-state-2.0.7-r1
+2102082039 metadata/md5-cache/dev-ml/opam-state-2.0.8
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
 1910170740 metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2
@@ -40063,7 +40102,6 @@
 2101070139 metadata/md5-cache/dev-perl/Ref-Util-XS-0.116.0
 2101070139 metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
 2101070139 metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
-2101070139 metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
 2101070139 metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
 2101070139 metadata/md5-cache/dev-perl/SUPER-1.201.411.170
 2101070139 metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
@@ -40539,7 +40577,6 @@
 2101231224 metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
 2101231224 metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
 2101231224 metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
-2101231224 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
@@ -40551,7 +40588,6 @@
 2101231224 metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
-2101231224 metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
 2101231224 metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
 2101231224 metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
 2101231224 metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
@@ -40643,8 +40679,11 @@
 2102040009 metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
 2102042039 metadata/md5-cache/dev-perl/Devel-CheckOS-1.830.0
 2102042039 metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
-2102042039 metadata/md5-cache/dev-perl/Manifest.gz
 2102042039 metadata/md5-cache/dev-perl/Test-Compile-2.4.1
+2102082209 metadata/md5-cache/dev-perl/Manifest.gz
+2102082209 metadata/md5-cache/dev-perl/SGMLSpm-1.1-r1
+2102082209 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+2102082209 metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
 1903202339 metadata/md5-cache/dev-php/PEAR-HTTP_Header-1.2.1-r2
 1809192309 metadata/md5-cache/dev-php/PEAR-Net_LDAP3-1.0.5_pre20160405
 1908161739 metadata/md5-cache/dev-php/ca-bundle-1.1.3
@@ -43061,7 +43100,6 @@
 2102042210 metadata/md5-cache/dev-python/zstandard-0.15.1
 2102042210 metadata/md5-cache/dev-python/zstd-1.4.5.1
 2102042210 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2102081209 metadata/md5-cache/dev-python/Manifest.gz
 2102070309 metadata/md5-cache/dev-python/amodem-1.15.1-r1
 2102071209 metadata/md5-cache/dev-python/apispec-4.2.0
 2102061209 metadata/md5-cache/dev-python/autobahn-21.1.1
@@ -43072,8 +43110,6 @@
 2102061739 metadata/md5-cache/dev-python/breathe-4.25.1-r1
 2102060439 metadata/md5-cache/dev-python/breathe-4.26.1
 2102061239 metadata/md5-cache/dev-python/brotlicffi-1.0.9.1
-2102071209 metadata/md5-cache/dev-python/construct-2.10.59
-2102081209 metadata/md5-cache/dev-python/cryptography-3.3.2
 2102081209 metadata/md5-cache/dev-python/cwcwidth-0.1.4
 2102060039 metadata/md5-cache/dev-python/dask-2021.2.0
 2102080939 metadata/md5-cache/dev-python/dbusmock-0.20.0
@@ -43083,7 +43119,6 @@
 2102060039 metadata/md5-cache/dev-python/iso8601-0.1.14
 2102081209 metadata/md5-cache/dev-python/jsonpickle-1.5.2
 2102061239 metadata/md5-cache/dev-python/lmdb-1.1.1
-2102081209 metadata/md5-cache/dev-python/lmfit-1.0.2
 2102081209 metadata/md5-cache/dev-python/more-itertools-8.7.0
 2102080209 metadata/md5-cache/dev-python/numpy-1.20.1
 2102061739 metadata/md5-cache/dev-python/packaging-20.8
@@ -43105,6 +43140,12 @@
 2102060039 metadata/md5-cache/dev-python/unidecode-1.2.0
 2102052339 metadata/md5-cache/dev-python/urllib3-1.26.3
 2102060039 metadata/md5-cache/dev-python/xmlschema-1.5.0
+2102082039 metadata/md5-cache/dev-python/Manifest.gz
+2102081909 metadata/md5-cache/dev-python/bracex-2.1.1
+2102081839 metadata/md5-cache/dev-python/construct-2.10.59
+2102082039 metadata/md5-cache/dev-python/cryptography-3.3.2
+2102081839 metadata/md5-cache/dev-python/jsonpickle-2.0.0
+2102081839 metadata/md5-cache/dev-python/lmfit-1.0.2
 2101101239 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2101231224 metadata/md5-cache/dev-qt/qt-creator-4.12.3
 2101231224 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -44265,7 +44306,6 @@
 2101291209 metadata/md5-cache/dev-ruby/rubygems-3.2.7
 2102071939 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 2102071939 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
-2102071939 metadata/md5-cache/dev-ruby/Manifest.gz
 2102071939 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
 2102071939 metadata/md5-cache/dev-ruby/acme-client-2.0.6
 2102071939 metadata/md5-cache/dev-ruby/acme-client-2.0.7
@@ -44828,7 +44868,6 @@
 2102071939 metadata/md5-cache/dev-ruby/nio4r-2.5.4
 2102071939 metadata/md5-cache/dev-ruby/nio4r-2.5.5
 2102071939 metadata/md5-cache/dev-ruby/nokogiri-1.10.10
-2102071939 metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r1
 2102071939 metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r2
 2102071939 metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
 2102071939 metadata/md5-cache/dev-ruby/nokogumbo-2.0.2
@@ -45461,6 +45500,8 @@
 2102071939 metadata/md5-cache/dev-ruby/zeitwerk-2.4.1
 2102071939 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
 2102071939 metadata/md5-cache/dev-ruby/zentest-4.12.0
+2102082039 metadata/md5-cache/dev-ruby/Manifest.gz
+2102082039 metadata/md5-cache/dev-ruby/nokogiri-1.11.1-r1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -45767,7 +45808,6 @@
 2012281255 metadata/md5-cache/dev-util/drone-cli-1.1.4
 2012281255 metadata/md5-cache/dev-util/geany-1.36
 2012281255 metadata/md5-cache/dev-util/geany-1.37
-2012281255 metadata/md5-cache/dev-util/goland-2020.3
 2012281255 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r3
 2012281255 metadata/md5-cache/dev-util/kup-0.3.6
 2012281255 metadata/md5-cache/dev-util/packer-1.4.0
@@ -46334,7 +46374,6 @@
 2102042210 metadata/md5-cache/dev-util/pkgcheck-0.7.7-r1
 2102042210 metadata/md5-cache/dev-util/pkgcheck-0.7.9-r1
 2102042210 metadata/md5-cache/dev-util/pkgcheck-0.7.9-r2
-2102042210 metadata/md5-cache/dev-util/pkgcheck-0.8.1
 2102042210 metadata/md5-cache/dev-util/pkgcheck-9999
 2102042210 metadata/md5-cache/dev-util/rbtools-1.0.3
 2102042210 metadata/md5-cache/dev-util/rbtools-2.0
@@ -46350,7 +46389,6 @@
 2102042210 metadata/md5-cache/dev-util/wstool-0.1.18
 2102042210 metadata/md5-cache/dev-util/wstool-9999
 2102042210 metadata/md5-cache/dev-util/ydiff-1.2
-2102081239 metadata/md5-cache/dev-util/Manifest.gz
 2102071939 metadata/md5-cache/dev-util/aruba-0.14.14
 2102071939 metadata/md5-cache/dev-util/aruba-0.6.2-r2
 2102071939 metadata/md5-cache/dev-util/aruba-1.0.2
@@ -46390,6 +46428,9 @@
 2102060109 metadata/md5-cache/dev-util/scons-4.0.1
 2102061209 metadata/md5-cache/dev-util/stripe-mock-0.102.0
 2102080939 metadata/md5-cache/dev-util/xfce4-dev-tools-4.16.0
+2102081839 metadata/md5-cache/dev-util/Manifest.gz
+2102081839 metadata/md5-cache/dev-util/goland-2020.3.2
+2102081839 metadata/md5-cache/dev-util/pkgcheck-0.8.1
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
@@ -47700,9 +47741,7 @@
 2101231224 metadata/md5-cache/gui-libs/amtk-5.2.0
 2101231224 metadata/md5-cache/gui-libs/greetd-0.6.1
 2101231224 metadata/md5-cache/gui-libs/greetd-0.7.0
-2101231224 metadata/md5-cache/gui-libs/libwpe-1.8.0
 2101231224 metadata/md5-cache/gui-libs/tepl-4.4.0
-2101231224 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
 2101310343 metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
 2101310343 metadata/md5-cache/gui-libs/libhandy-0.0.13
 2101310343 metadata/md5-cache/gui-libs/libhandy-1.0.2
@@ -47719,8 +47758,10 @@
 2101310343 metadata/md5-cache/gui-libs/wlroots-0.12.0
 2101310343 metadata/md5-cache/gui-libs/wlroots-9999
 2101310343 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2102060209 metadata/md5-cache/gui-libs/Manifest.gz
 2102060209 metadata/md5-cache/gui-libs/display-manager-init-1.0-r1
+2102082039 metadata/md5-cache/gui-libs/Manifest.gz
+2102082039 metadata/md5-cache/gui-libs/libwpe-1.8.0
+2102082039 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
 2101231224 metadata/md5-cache/gui-wm/hikari-2.2.2-r1
 2101310343 metadata/md5-cache/gui-wm/Manifest.gz
 2101310343 metadata/md5-cache/gui-wm/sway-1.5.1-r1
@@ -48553,13 +48594,13 @@
 2102042210 metadata/md5-cache/mail-client/alot-0.9
 2102042210 metadata/md5-cache/mail-client/alot-0.9.1
 2102042210 metadata/md5-cache/mail-client/alot-9999
-2102061639 metadata/md5-cache/mail-client/Manifest.gz
-2102061639 metadata/md5-cache/mail-client/claws-mail-3.17.7
 2102052209 metadata/md5-cache/mail-client/neomutt-20210205
 2102052209 metadata/md5-cache/mail-client/neomutt-99999999
 2102052139 metadata/md5-cache/mail-client/thunderbird-78.7.0
 2102052309 metadata/md5-cache/mail-client/thunderbird-78.7.1
 2102052339 metadata/md5-cache/mail-client/thunderbird-bin-78.7.1
+2102082039 metadata/md5-cache/mail-client/Manifest.gz
+2102082039 metadata/md5-cache/mail-client/claws-mail-3.17.7
 1910071209 metadata/md5-cache/mail-filter/spampd-2.42
 1702282325 metadata/md5-cache/mail-filter/spamprobe-1.4d-r1
 1911161109 metadata/md5-cache/mail-filter/zdkimfilter-1.8
@@ -49285,7 +49326,6 @@
 2101310343 metadata/md5-cache/media-gfx/zbar-0.23.1
 2102011639 metadata/md5-cache/media-gfx/alembic-1.7.16
 2102011809 metadata/md5-cache/media-gfx/imagemagick-9999
-2102020139 metadata/md5-cache/media-gfx/pngcheck-3.0.2
 2102030639 metadata/md5-cache/media-gfx/darktable-3.4.0-r1
 2102030309 metadata/md5-cache/media-gfx/tuxpaint-0.9.24
 2102031439 metadata/md5-cache/media-gfx/iscan-3.65.0
@@ -49307,7 +49347,6 @@
 2102042210 metadata/md5-cache/media-gfx/xdot-1.1
 2102042210 metadata/md5-cache/media-gfx/xdot-1.2
 2102042210 metadata/md5-cache/media-gfx/xdot-9999
-2102081009 metadata/md5-cache/media-gfx/Manifest.gz
 2102081009 metadata/md5-cache/media-gfx/ahoviewer-1.6.5-r3
 2102070439 metadata/md5-cache/media-gfx/feh-3.6.1
 2102070409 metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
@@ -49316,6 +49355,10 @@
 2102070409 metadata/md5-cache/media-gfx/imagemagick-7.0.10.61-r1
 2102070139 metadata/md5-cache/media-gfx/llgal-0.13.19-r1
 2102051209 metadata/md5-cache/media-gfx/prusaslicer-2.3.0
+2102082039 metadata/md5-cache/media-gfx/Manifest.gz
+2102081709 metadata/md5-cache/media-gfx/darktable-3.4.1
+2102081709 metadata/md5-cache/media-gfx/gmic-2.9.5
+2102082039 metadata/md5-cache/media-gfx/pngcheck-3.0.2
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1805290208 metadata/md5-cache/media-libs/libpqstego-0.0.1
@@ -49597,7 +49640,6 @@
 2101231224 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
 2101231224 metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
 2101231224 metadata/md5-cache/media-libs/libraw-0.20.0
-2101231224 metadata/md5-cache/media-libs/libraw-0.20.2
 2101231224 metadata/md5-cache/media-libs/libreplaygain-477-r1
 2101231224 metadata/md5-cache/media-libs/librosprite-0.1.3-r2
 2101231224 metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
@@ -49789,7 +49831,6 @@
 2101310343 metadata/md5-cache/media-libs/dav1d-0.8.1
 2101310343 metadata/md5-cache/media-libs/dav1d-9999
 2101310343 metadata/md5-cache/media-libs/ganv-1.6.0-r1
-2101310343 metadata/md5-cache/media-libs/ganv-1.8.0
 2101310039 metadata/md5-cache/media-libs/gd-2.3.1
 2101310343 metadata/md5-cache/media-libs/gegl-0.4.24
 2101310343 metadata/md5-cache/media-libs/gegl-0.4.26
@@ -49837,7 +49878,6 @@
 2101310343 metadata/md5-cache/media-libs/lilv-0.24.10-r1
 2101310343 metadata/md5-cache/media-libs/lilv-0.24.12
 2101310343 metadata/md5-cache/media-libs/lv2-1.18.0
-2101310343 metadata/md5-cache/media-libs/lv2-1.18.2
 2101310343 metadata/md5-cache/media-libs/lvtk-1.2.0-r1
 2101310343 metadata/md5-cache/media-libs/mesa-20.2.6
 2101310343 metadata/md5-cache/media-libs/mesa-20.3.3
@@ -49904,10 +49944,8 @@
 2102042210 metadata/md5-cache/media-libs/portmidi-217-r3
 2102050539 metadata/md5-cache/media-libs/qhull-2020.2-r3
 2102050539 metadata/md5-cache/media-libs/svt-av1-0.8.6
-2102081239 metadata/md5-cache/media-libs/Manifest.gz
 2102072139 metadata/md5-cache/media-libs/glm-0.9.9.8-r1
 2102061539 metadata/md5-cache/media-libs/hamlib-4.1
-2102062039 metadata/md5-cache/media-libs/lcms-2.12
 2102051539 metadata/md5-cache/media-libs/libilbc-3.0.4
 2102051539 metadata/md5-cache/media-libs/libopenraw-0.1.3
 2102072139 metadata/md5-cache/media-libs/libprojectm-3.1.8
@@ -49920,6 +49958,11 @@
 2102060309 metadata/md5-cache/media-libs/phonon-vlc-0.11.2
 2102061739 metadata/md5-cache/media-libs/tiff-4.2.0
 2102061909 metadata/md5-cache/media-libs/zita-resampler-1.8.0
+2102082039 metadata/md5-cache/media-libs/Manifest.gz
+2102082039 metadata/md5-cache/media-libs/ganv-1.8.0
+2102081809 metadata/md5-cache/media-libs/lcms-2.12
+2102082039 metadata/md5-cache/media-libs/libraw-0.20.2
+2102082039 metadata/md5-cache/media-libs/lv2-1.18.2
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -50172,8 +50215,6 @@
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.2
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
-2101231224 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.1.0
-2101231224 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.2.0
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.1
 2101231224 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.0.0
@@ -50398,12 +50439,13 @@
 2101310343 metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
 2101312009 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.2
 2101310343 metadata/md5-cache/media-plugins/mda-lv2-1.2.4
-2101310343 metadata/md5-cache/media-plugins/mda-lv2-1.2.6
 2101310343 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
 2101310343 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
 2102040409 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.1
-2102051539 metadata/md5-cache/media-plugins/Manifest.gz
 2102051539 metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.1
+2102082039 metadata/md5-cache/media-plugins/Manifest.gz
+2102081739 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.4.0
+2102082039 metadata/md5-cache/media-plugins/mda-lv2-1.2.6
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -50762,7 +50804,6 @@
 2101231224 metadata/md5-cache/media-sound/snapcast-0.20.0
 2101231224 metadata/md5-cache/media-sound/snapcast-9999
 2101231224 metadata/md5-cache/media-sound/snd-17.4-r1
-2101231224 metadata/md5-cache/media-sound/sndio-1.7.0
 2101231224 metadata/md5-cache/media-sound/sndpeek-1.41-r1
 2101231224 metadata/md5-cache/media-sound/sonic-visualiser-4.2
 2101231224 metadata/md5-cache/media-sound/sooperlooper-1.7.4
@@ -50882,7 +50923,6 @@
 2101310343 metadata/md5-cache/media-sound/ncmpc-0.39
 2101310343 metadata/md5-cache/media-sound/paprefs-1.1
 2101310343 metadata/md5-cache/media-sound/patchage-1.0.2
-2101310343 metadata/md5-cache/media-sound/patchage-1.0.4
 2101310343 metadata/md5-cache/media-sound/pithos-1.5.0
 2101310343 metadata/md5-cache/media-sound/playerctl-2.0.2
 2101310343 metadata/md5-cache/media-sound/playerctl-2.2.1
@@ -50927,9 +50967,7 @@
 2102042210 metadata/md5-cache/media-sound/quodlibet-4.3.0
 2102042210 metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
 2102042210 metadata/md5-cache/media-sound/whipper-0.9.0
-2102081309 metadata/md5-cache/media-sound/Manifest.gz
 2102081209 metadata/md5-cache/media-sound/jalv-1.6.4
-2102081209 metadata/md5-cache/media-sound/jalv-1.6.6
 2102071109 metadata/md5-cache/media-sound/qjackctl-0.9.0
 2102071139 metadata/md5-cache/media-sound/qjackctl-0.9.1
 2102071809 metadata/md5-cache/media-sound/qsampler-0.9.1
@@ -50937,6 +50975,10 @@
 2102071739 metadata/md5-cache/media-sound/qsynth-0.9.1
 2102071739 metadata/md5-cache/media-sound/qsynth-9999
 2102081309 metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta40
+2102082039 metadata/md5-cache/media-sound/Manifest.gz
+2102082039 metadata/md5-cache/media-sound/jalv-1.6.6
+2102082039 metadata/md5-cache/media-sound/patchage-1.0.4
+2102081839 metadata/md5-cache/media-sound/sndio-1.7.0
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -52386,7 +52428,6 @@
 2101310343 metadata/md5-cache/net-libs/telepathy-qt-9999
 2101310343 metadata/md5-cache/net-libs/webkit-gtk-2.30.3
 2101310343 metadata/md5-cache/net-libs/webkit-gtk-2.30.4
-2101310343 metadata/md5-cache/net-libs/webkit-gtk-2.30.4-r1
 2101310343 metadata/md5-cache/net-libs/xrootd-4.12.4
 2101310343 metadata/md5-cache/net-libs/xrootd-4.12.5
 2101310343 metadata/md5-cache/net-libs/xrootd-5.0.2
@@ -52411,11 +52452,12 @@
 2102042210 metadata/md5-cache/net-libs/stem-1.7.0
 2102042210 metadata/md5-cache/net-libs/stem-1.7.1
 2102042210 metadata/md5-cache/net-libs/stem-1.8.0-r1
-2102071209 metadata/md5-cache/net-libs/Manifest.gz
 2102071209 metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0
 2102051539 metadata/md5-cache/net-libs/libgsasl-1.10.0
 2102052039 metadata/md5-cache/net-libs/libnet-1.0.2a-r7
 2102060309 metadata/md5-cache/net-libs/libpcap-1.10.0
+2102082039 metadata/md5-cache/net-libs/Manifest.gz
+2102082039 metadata/md5-cache/net-libs/webkit-gtk-2.30.4-r1
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1910170740 metadata/md5-cache/net-mail/mhonarc-gentoo-2.6.18-r2
 1907061239 metadata/md5-cache/net-mail/mpop-1.4.4
@@ -52545,13 +52587,13 @@
 2102042210 metadata/md5-cache/net-mail/onionrouter-9999
 2102042210 metadata/md5-cache/net-mail/postorius-1.3.3
 2102042210 metadata/md5-cache/net-mail/rss2email-3.12.2-r1
-2102071939 metadata/md5-cache/net-mail/Manifest.gz
 2102060039 metadata/md5-cache/net-mail/dovecot-2.3.13-r1
 2102062309 metadata/md5-cache/net-mail/dovecot-2.3.13-r100
 2102071939 metadata/md5-cache/net-mail/mailshears-0.0.4
 2102051539 metadata/md5-cache/net-mail/pflogsumm-1.1.5-r2
 2102070139 metadata/md5-cache/net-mail/pfqueue-0.5.6-r1
-2102061639 metadata/md5-cache/net-mail/ytnef-1.9.3
+2102082039 metadata/md5-cache/net-mail/Manifest.gz
+2102082039 metadata/md5-cache/net-mail/ytnef-1.9.3
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -53023,7 +53065,6 @@
 2101310343 metadata/md5-cache/net-misc/wget-1.20.3-r3
 2101310343 metadata/md5-cache/net-misc/wget-1.21-r1
 2101310343 metadata/md5-cache/net-misc/wget-1.21.1
-2102010309 metadata/md5-cache/net-misc/curl-7.74.0-r4
 2102010909 metadata/md5-cache/net-misc/gsasl-1.8.0-r1
 2102010909 metadata/md5-cache/net-misc/gsasl-1.8.1
 2102010009 metadata/md5-cache/net-misc/icaclient-20.12.0.12-r2
@@ -53083,10 +53124,8 @@
 2102042210 metadata/md5-cache/net-misc/youtube-dl-2021.02.04
 2102042210 metadata/md5-cache/net-misc/youtube-dl-2021.02.04.1
 2102042210 metadata/md5-cache/net-misc/youtube-dl-9999
-2102081409 metadata/md5-cache/net-misc/Manifest.gz
 2102070439 metadata/md5-cache/net-misc/axel-2.17.10
 2102051409 metadata/md5-cache/net-misc/chrony-4.0
-2102051409 metadata/md5-cache/net-misc/chrony-9999
 2102072339 metadata/md5-cache/net-misc/dhcpcd-ui-0.7.8
 2102081009 metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
 2102051909 metadata/md5-cache/net-misc/ethertypes-0
@@ -53100,6 +53139,12 @@
 2102081409 metadata/md5-cache/net-misc/kafka-bin-2.7.0
 2102080239 metadata/md5-cache/net-misc/nx-3.5.99.26
 2102061839 metadata/md5-cache/net-misc/zerotier-1.6.3
+2102081939 metadata/md5-cache/net-misc/Manifest.gz
+2102081839 metadata/md5-cache/net-misc/chrony-4.0-r1
+2102081839 metadata/md5-cache/net-misc/chrony-9999
+2102081809 metadata/md5-cache/net-misc/connman-1.39
+2102081909 metadata/md5-cache/net-misc/connman-1.39-r1
+2102081939 metadata/md5-cache/net-misc/curl-7.74.0-r4
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2012231444 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -53240,12 +53285,13 @@
 2102042210 metadata/md5-cache/net-p2p/nicotine+-2.1.2
 2102042210 metadata/md5-cache/net-p2p/nicotine+-2.2.2
 2102042210 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
-2102071209 metadata/md5-cache/net-p2p/Manifest.gz
 2102071209 metadata/md5-cache/net-p2p/bitcoin-cli-0.21.0
 2102071209 metadata/md5-cache/net-p2p/bitcoin-qt-0.21.0
 2102071209 metadata/md5-cache/net-p2p/bitcoind-0.21.0
 2102051539 metadata/md5-cache/net-p2p/nicotine+-2.2.0
 2102062109 metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
+2102081809 metadata/md5-cache/net-p2p/Manifest.gz
+2102081809 metadata/md5-cache/net-p2p/syncthing-1.13.1
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
 1702282329 metadata/md5-cache/net-print/ink-0.5.2
@@ -53347,15 +53393,15 @@
 2101241439 metadata/md5-cache/net-proxy/squid-4.13
 2101310343 metadata/md5-cache/net-proxy/hatop-0.8.0
 2101310639 metadata/md5-cache/net-proxy/privoxy-3.0.29
-2101310639 metadata/md5-cache/net-proxy/privoxy-3.0.31
 2101310343 metadata/md5-cache/net-proxy/trojan-1.16.0-r1
 2101310343 metadata/md5-cache/net-proxy/trojan-9999
 2102040639 metadata/md5-cache/net-proxy/microsocks-1.0.2
 2102042210 metadata/md5-cache/net-proxy/mitmproxy-6.0.2
 2102042210 metadata/md5-cache/net-proxy/sshuttle-1.0.5
-2102081209 metadata/md5-cache/net-proxy/Manifest.gz
 2102081209 metadata/md5-cache/net-proxy/haproxy-2.2.9
 2102081209 metadata/md5-cache/net-proxy/haproxy-2.3.5
+2102082039 metadata/md5-cache/net-proxy/Manifest.gz
+2102082039 metadata/md5-cache/net-proxy/privoxy-3.0.31
 2101231224 metadata/md5-cache/net-voip/yate-6.2.0
 2101231224 metadata/md5-cache/net-voip/yate-9999
 2101310343 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r2
@@ -54256,10 +54302,12 @@
 2101310343 metadata/md5-cache/sci-geosciences/qgis-3.16.3
 2101310343 metadata/md5-cache/sci-geosciences/qgis-9999
 2102021339 metadata/md5-cache/sci-geosciences/GeographicLib-1.51
-2102042210 metadata/md5-cache/sci-geosciences/Manifest.gz
 2102042210 metadata/md5-cache/sci-geosciences/gpsd-3.21
 2102042210 metadata/md5-cache/sci-geosciences/gpsd-9999
 2102042210 metadata/md5-cache/sci-geosciences/routino-3.3.2
+2102081709 metadata/md5-cache/sci-geosciences/Manifest.gz
+2102081639 metadata/md5-cache/sci-geosciences/gpxsee-8.4
+2102081709 metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -54605,12 +54653,14 @@
 2102050709 metadata/md5-cache/sci-libs/tensorflow-2.4.0
 2102050709 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
 2102050709 metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0
-2102080309 metadata/md5-cache/sci-libs/Manifest.gz
 2102070139 metadata/md5-cache/sci-libs/gdal-3.2.1-r1
 2102070039 metadata/md5-cache/sci-libs/lapack-3.8.0
 2102070039 metadata/md5-cache/sci-libs/lapack-3.8.0-r1
 2102070039 metadata/md5-cache/sci-libs/lapack-3.9.0-r1
 2102080309 metadata/md5-cache/sci-libs/rtree-0.9.4-r1
+2102082209 metadata/md5-cache/sci-libs/Manifest.gz
+2102082209 metadata/md5-cache/sci-libs/linux-gpib-4.3.4
+2102082209 metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
 1912080309 metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -55370,7 +55420,6 @@
 2002100339 metadata/md5-cache/sys-apps/gscanbus-0.8
 2002112051 metadata/md5-cache/sys-apps/fix-gnustack-0.1
 2002112051 metadata/md5-cache/sys-apps/lcdsplash-0.3
-2002222009 metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
 2003042239 metadata/md5-cache/sys-apps/mlxup-bin-4.13.0
 2003160109 metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1
 2003261841 metadata/md5-cache/sys-apps/nosig-2
@@ -55398,7 +55447,6 @@
 2010112109 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.3
 2010112109 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.0
 2010112109 metadata/md5-cache/sys-apps/s6-rc-0.5.2.0
-2010091139 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
 2010160909 metadata/md5-cache/sys-apps/ethtool-5.9
 2010300209 metadata/md5-cache/sys-apps/isapnptools-1.27
 2011061444 metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
@@ -55475,7 +55523,6 @@
 2101231224 metadata/md5-cache/sys-apps/bat-0.17.1
 2101231224 metadata/md5-cache/sys-apps/bat-0.17.1-r1
 2101231224 metadata/md5-cache/sys-apps/biosdevname-0.7.3
-2101231224 metadata/md5-cache/sys-apps/bubblewrap-0.4.1
 2101231224 metadata/md5-cache/sys-apps/busybox-1.32.0-r1
 2101231224 metadata/md5-cache/sys-apps/busybox-1.32.1
 2101231224 metadata/md5-cache/sys-apps/busybox-1.33.0
@@ -55842,13 +55889,8 @@
 2101310343 metadata/md5-cache/sys-apps/razercfg-0.42
 2101310343 metadata/md5-cache/sys-apps/selinux-python-9999
 2101310343 metadata/md5-cache/sys-apps/systemd-246-r2
-2101310343 metadata/md5-cache/sys-apps/systemd-246.6
-2101310343 metadata/md5-cache/sys-apps/systemd-247.2-r4
-2101310343 metadata/md5-cache/sys-apps/systemd-9999
 2101310343 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
 2101310343 metadata/md5-cache/sys-apps/tuned-2.13.0-r1
-2101312039 metadata/md5-cache/sys-apps/usbguard-0.7.8
-2101312039 metadata/md5-cache/sys-apps/usbguard-1.0.0
 2101310343 metadata/md5-cache/sys-apps/usbutils-012
 2101310343 metadata/md5-cache/sys-apps/usbutils-013
 2101310343 metadata/md5-cache/sys-apps/usbutils-013-r1
@@ -55890,7 +55932,6 @@
 2102042210 metadata/md5-cache/sys-apps/portage-3.0.14
 2102042210 metadata/md5-cache/sys-apps/portage-3.0.9
 2102042210 metadata/md5-cache/sys-apps/portage-9999
-2102080939 metadata/md5-cache/sys-apps/Manifest.gz
 2102061339 metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
 2102072039 metadata/md5-cache/sys-apps/edid-decode-0_pre20201230
 2102080939 metadata/md5-cache/sys-apps/help2man-1.47.17
@@ -55901,6 +55942,15 @@
 2102072009 metadata/md5-cache/sys-apps/man-pages-5.10
 2102070739 metadata/md5-cache/sys-apps/policycoreutils-3.1-r2
 2102070739 metadata/md5-cache/sys-apps/selinux-python-3.1-r2
+2102082039 metadata/md5-cache/sys-apps/Manifest.gz
+2102082039 metadata/md5-cache/sys-apps/bubblewrap-0.4.1
+2102081939 metadata/md5-cache/sys-apps/systemd-246.6
+2102081939 metadata/md5-cache/sys-apps/systemd-247.2-r4
+2102081939 metadata/md5-cache/sys-apps/systemd-9999
+2102081709 metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
+2102081709 metadata/md5-cache/sys-apps/usbguard-0.7.8
+2102081709 metadata/md5-cache/sys-apps/usbguard-1.0.0
+2102082039 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009131039 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -57297,7 +57347,6 @@
 2102042210 metadata/md5-cache/sys-libs/libseccomp-2.5.0
 2102042210 metadata/md5-cache/sys-libs/libseccomp-2.5.1
 2102042210 metadata/md5-cache/sys-libs/libseccomp-9999
-2102072139 metadata/md5-cache/sys-libs/Manifest.gz
 2102060109 metadata/md5-cache/sys-libs/db-5.3.28-r4
 2102060109 metadata/md5-cache/sys-libs/glibc-2.32-r6
 2102051409 metadata/md5-cache/sys-libs/libcap-2.48
@@ -57330,7 +57379,8 @@
 2102071009 metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
 2102071009 metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
 2102051539 metadata/md5-cache/sys-libs/timezone-data-2020e
-2102060309 metadata/md5-cache/sys-libs/timezone-data-2020f
+2102081839 metadata/md5-cache/sys-libs/Manifest.gz
+2102081839 metadata/md5-cache/sys-libs/timezone-data-2020f
 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
@@ -57466,10 +57516,10 @@
 2102042210 metadata/md5-cache/sys-process/glances-3.1.4.1-r1
 2102042210 metadata/md5-cache/sys-process/glances-3.1.5
 2102042210 metadata/md5-cache/sys-process/iotop-0.6
-2102081009 metadata/md5-cache/sys-process/Manifest.gz
-2102080939 metadata/md5-cache/sys-process/audit-3.0
 2102081009 metadata/md5-cache/sys-process/evisum-0.5.9
 2102072009 metadata/md5-cache/sys-process/psmisc-23.4
+2102081839 metadata/md5-cache/sys-process/Manifest.gz
+2102081839 metadata/md5-cache/sys-process/audit-3.0
 1703291908 metadata/md5-cache/virtual/ooo-0
 1703291908 metadata/md5-cache/virtual/perl6-0
 1706251038 metadata/md5-cache/virtual/skkserv-0
@@ -57783,10 +57833,11 @@
 2101231224 metadata/md5-cache/www-apache/passenger-6.0.6
 2101231224 metadata/md5-cache/www-apache/passenger-6.0.7
 2101231224 metadata/md5-cache/www-apache/pwauth-2.3.10
-2101310343 metadata/md5-cache/www-apache/Manifest.gz
 2101310343 metadata/md5-cache/www-apache/mod_gnutls-0.11.0
 2101310343 metadata/md5-cache/www-apache/mod_wsgi-4.7.0
 2101310343 metadata/md5-cache/www-apache/mod_wsgi-4.7.1
+2102081709 metadata/md5-cache/www-apache/Manifest.gz
+2102081709 metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
 1904250439 metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
 1806241039 metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
 1702282334 metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
@@ -58027,9 +58078,10 @@
 2101231224 metadata/md5-cache/www-plugins/lightspark-0.8.3
 2101310343 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
 2102040039 metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4389.40_beta
-2102061209 metadata/md5-cache/www-plugins/Manifest.gz
 2102061209 metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.150
 2102061209 metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4408.0_alpha
+2102081839 metadata/md5-cache/www-plugins/Manifest.gz
+2102081839 metadata/md5-cache/www-plugins/lightspark-0.8.4
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 2009141809 metadata/md5-cache/www-servers/caddy-2.0.0
 2010261639 metadata/md5-cache/www-servers/caddy-2.2.1
@@ -58873,7 +58925,6 @@
 2102021639 metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
 2102032339 metadata/md5-cache/x11-misc/xvfb-run-1.20.10_p2
 2102042210 metadata/md5-cache/x11-misc/arandr-0.1.10
-2102042210 metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
 2102050139 metadata/md5-cache/x11-misc/i3blocks-1.5-r1
 2102042210 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
 2102042210 metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
@@ -58890,12 +58941,13 @@
 2102042210 metadata/md5-cache/x11-misc/zim-0.73.3
 2102042210 metadata/md5-cache/x11-misc/zim-0.73.4
 2102042210 metadata/md5-cache/x11-misc/zim-0.73.5
-2102080009 metadata/md5-cache/x11-misc/Manifest.gz
 2102070439 metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
 2102072339 metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
 2102080009 metadata/md5-cache/x11-misc/py3status-3.33
 2102071209 metadata/md5-cache/x11-misc/wbar-2.3.4-r3
 2102072339 metadata/md5-cache/x11-misc/xsensors-0.80
+2102081639 metadata/md5-cache/x11-misc/Manifest.gz
+2102081639 metadata/md5-cache/x11-misc/grub2-theme-preview-2.2.0
 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
@@ -59524,7 +59576,6 @@
 2101310343 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
 2101310343 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
 2101310343 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2102080939 metadata/md5-cache/xfce-extra/Manifest.gz
 2102080939 metadata/md5-cache/xfce-extra/thunar-volman-4.16.0
 2102080939 metadata/md5-cache/xfce-extra/tumbler-4.16.0
 2102080939 metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.4
@@ -59533,7 +59584,6 @@
 2102080909 metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
 2102080909 metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.2
 2102080939 metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.1
-2102080409 metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.1
 2102080939 metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.5
 2102080939 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.0
 2102080939 metadata/md5-cache/xfce-extra/xfce4-power-manager-4.16.0
@@ -59549,4 +59599,6 @@
 2102080909 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.5.3
 2102080939 metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.2
 2102080909 metadata/md5-cache/xfce-extra/xfdashboard-0.8.0
-2102081409 metadata/md5-cache/Manifest.gz
+2102082209 metadata/md5-cache/xfce-extra/Manifest.gz
+2102082209 metadata/md5-cache/xfce-extra/xfce4-hdaps-1.0.3
+2102082209 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d46a50103432..3bb2dfd7aa76 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Feb 2021 11:30:01 +0000
+Mon, 08 Feb 2021 20:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 786903c42c99..a7690176c692 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2f4c1856bf8ced3c1f93154954015cdbb37ef577 1612782314 2021-02-08T11:05:14+00:00
+1347cc863ef59c588aabbe27d7cb9067801cb004 1612810882 2021-02-08T19:01:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 12270bf0dc3a..6e147b94a24c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1612782301 Mon 08 Feb 2021 11:05:01 AM UTC
+1612812901 Mon 08 Feb 2021 07:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 30c136efdbe2..4c4fcc7ff7b2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Feb 2021 11:08:36 +0000
+Mon, 08 Feb 2021 19:38:30 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1d34b2e66f82..8be1d0be9d69 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3ed5a289729c..dfa3281361a7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,6 +7,6 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
 DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
 EBUILD webkit-gtk-2.30.3.ebuild 9208 BLAKE2B ca7501115f8d743047285cc25b616b0aeef3b39d8b8a9990a0ebb1d19ef2986a5140e95c03e673f90f14ebdef6af2aa4c5139143220f9402c1a1a23583a0c241 SHA512 db0613dce9ded6aeec0397a6dbbb49929da3c58b3a0b6b5618d3a275c153be0daed627cfa056f81a317a5bfe23a90d4113f663e3681d10624dce17e3eefe23b9
-EBUILD webkit-gtk-2.30.4-r1.ebuild 9251 BLAKE2B dd31a9fb405cd178f9ab6dddb7327702c978bf39798fe9b36151fb5ed1977338df2217de7c9704589c31d575689a7bda56681ec9445a4882b974e1c567b1c8eb SHA512 f16fc6066db0bbc273b5287ca34ea22ada54f0785cb4b7424b49055769ac6e290825bea1704b7e93a73e37ba98f9552653b391141bce2a8f0cab15979bba9a2e
+EBUILD webkit-gtk-2.30.4-r1.ebuild 9250 BLAKE2B b2822bf968e3e6e64835283a362e6113cd12f64615e4b6133517fb5e778377c2da7265fadbd15a55960cc79925de4ecd46b120f248f09ca366a4248552301805 SHA512 f6a6f9b99ed2be17156cfd3b0da5c3aede2c90d267193b607eee928b7d4a31a451acbb1eea43bb44a6e78769a8a6ea3919ced22dd6e2eb9149160a9c4f39624f
 EBUILD webkit-gtk-2.30.4.ebuild 9090 BLAKE2B b97ee857ba6cbd2ed71184d23e9b33b1ec79306866b75c33c253c46bbf7194287fb36dbb05a0a61747a1186408e8ae01f30a4023b32ff7f4826155fb7f94b2dd SHA512 4f19953415b014d480d648728cc0dddf1f1fa0719f9d9049c38c5c572bc2d8cc272cfd9e8f2b2156e33f8d3833ad311e78ccd0da4752f47a49b007dd74626d9e
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
index 42718dfa7a06..de3f01f764ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,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 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9fbeaac0c616..32b4c0d746ab 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 295c2ce93cf8..e96ee871d4fb 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,3 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
-EBUILD ytnef-1.9.3.ebuild 659 BLAKE2B 8dd466dda62d4ee54711939708f6b24cfc96017066311789b4837a5e7da4e5a17550fb2ac577239dd7c21473d7c75bba2b2ee7d9017ec36304babd22294a5ab0 SHA512 a4806b10b64b79f4d529003c611de7da952f47e5eac8076f13b7564eac67f7de4703edd98a787b2ba0914605ceb5a96058cef2f6bb68f594404a13ae44bddd79
+EBUILD ytnef-1.9.3.ebuild 658 BLAKE2B b18e9a798fb203e9a7c611763c00a3e379cc1a75ed1a84825c4086a12ac9575ed16b83d2b93cbe247b7a75c02f146ae7a7bcf4631b638966102edb1755cdbe37 SHA512 bb2f7f25d8eafa0052a2293827c20049a14b25ec5781740bcc0616686bfced4519076451e993d8ca5311a351ba5ff21baade6c33d9a127f5f039a07199908cab
 MISC metadata.xml 338 BLAKE2B 788b29610ed73aba390c90c1b6ac4028d5f607e5f5d93dac1ccf945602ba2c0640574ac222761544a47761a40b300ee773aa710a5d2afa0dabe40da9461940cd SHA512 5239663e2ba3a103c1e331b53393658e47d29b2fa4daec1bdea8ff727c39196e6c44a62db613893b4ab7266878c75c0bda21bab9ca25d26fd796ffc44af5703e
diff --git a/net-mail/ytnef/ytnef-1.9.3.ebuild b/net-mail/ytnef/ytnef-1.9.3.ebuild
index f102395908ad..ccdee16c4468 100644
--- a/net-mail/ytnef/ytnef-1.9.3.ebuild
+++ b/net-mail/ytnef/ytnef-1.9.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 37d5bd8fc0db..5fcf7228f654 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 25c5ae8b88c5..6b96caea360c 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -4,6 +4,7 @@ AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50
 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
+EBUILD chrony-4.0-r1.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee
 EBUILD chrony-4.0.ebuild 4324 BLAKE2B c6e4eef917c334681564f974323f503d088fe0aeac43e5c88f302f5e6f29fdb0d45fd2862d768621a23110deb53e907597efb44d361a794b2e37181ae3c19208 SHA512 be89d10a76643ad8c46d005f3ddc49dc60485a7b5954445a7ddc4468c142d31100465c0222231da43f338f621fc11de2bd20ecc42bde43424b85b48f01b84d1f
-EBUILD chrony-9999.ebuild 4331 BLAKE2B 78f950494707d2337ec28eba82196e99f27c6cada1560f252dba885f9fe1f0c74386a4b606147f8923d76abb8b7959e6e2034dd5eac68b1b3e791477362c9a21 SHA512 35273b13b5459d5d7fb03b59aa23aff830742b97968b61baa7655334eecbb2894281259907ed1b897de3f427e4168ed58e961e62ac3810a5bd9eda13bf148304
-MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f
+EBUILD chrony-9999.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee
+MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild
new file mode 100644
index 000000000000..7e6fadddffaa
--- /dev/null
+++ b/net-misc/chrony/chrony-4.0-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+else
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+	nts? ( nettle )
+"
+RESTRICT="test"
+
+BDEPEND="nettle? ( virtual/pkgconfig )"
+
+if [[ ${PV} == "9999" ]]; then
+	# Needed for doc generation in 9999
+	BDEPEND+=" virtual/w3m"
+	REQUIRED_USE+=" html"
+fi
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	nts? ( net-libs/gnutls:= )
+	libedit? ( dev-libs/libedit )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	seccomp? ( sys-libs/libseccomp )
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp; then
+		sed -i \
+			-e 's/ -F 0//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+		$(usex caps '' --disable-linuxcaps)
+		$(usex cmdmon '' --disable-cmdmon)
+		$(usex debug '--enable-debug' '')
+		$(usex ipv6 '' --disable-ipv6)
+		$(usex libedit '' --without-editline)
+		$(usex nettle '' --without-nettle)
+		$(usex nss '' --without-nss)
+		$(usex ntp '' --disable-ntp)
+		$(usex nts '' --disable-nts)
+		$(usex nts '' --without-gnutls)
+		$(usex phc '' --disable-phc)
+		$(usex pps '' --disable-pps)
+		$(usex refclock '' --disable-refclock)
+		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
+		$(usex sechash '' --disable-sechash)
+		$(usex libtomcrypt '' --disable-tomcrypt)
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+		${EXTRA_ECONF}
+	)
+
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		fowners ntp:ntp /var/{lib,log}/chrony
+		fperms 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=false
+	HAD_SECCOMP=false
+
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=true
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=true
+	fi
+
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! ${HAD_CAPS} ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && ! ${HAD_CAPS} ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
+		elog "To enable seccomp in enforcing mode, please modify:"
+		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
+	fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 705bbb05914e..7e6fadddffaa 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -20,8 +20,17 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux"
-REQUIRED_USE="sechash? ( nettle )"
+IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+	nts? ( nettle )
+"
 RESTRICT="test"
 
 BDEPEND="nettle? ( virtual/pkgconfig )"
@@ -38,8 +47,10 @@ DEPEND="
 		acct-user/ntp
 		sys-libs/libcap
 	)
+	nts? ( net-libs/gnutls:= )
 	libedit? ( dev-libs/libedit )
 	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
 	seccomp? ( sys-libs/libseccomp )
 	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
@@ -61,11 +72,6 @@ src_prepare() {
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	sed -i \
-		-e 's|RELOADDNS||g' \
-		-e 's|pkg-config|${PKG_CONFIG}|g' \
-		configure || die
-
 	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
 }
 
@@ -84,24 +90,30 @@ src_configure() {
 
 	tc-export CC PKG_CONFIG
 
-	# Note: ncurses and nss switches are mentioned in the configure script but
-	# do nothing
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
+		$(usex debug '--enable-debug' '')
 		$(usex ipv6 '' --disable-ipv6)
 		$(usex libedit '' --without-editline)
 		$(usex nettle '' --without-nettle)
+		$(usex nss '' --without-nss)
 		$(usex ntp '' --disable-ntp)
+		$(usex nts '' --disable-nts)
+		$(usex nts '' --without-gnutls)
 		$(usex phc '' --disable-phc)
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
 		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
-		${EXTRA_ECONF}
+		$(usex libtomcrypt '' --disable-tomcrypt)
 		--chronysockdir="${EPREFIX}/run/chrony"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--mandir="${EPREFIX}/usr/share/man"
@@ -109,8 +121,7 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/chrony"
 		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
+		${EXTRA_ECONF}
 	)
 
 	# print the ./configure call
@@ -165,18 +176,35 @@ src_install() {
 
 pkg_preinst() {
 	HAD_CAPS=false
+	HAD_SECCOMP=false
 
-	if has_version 'net-misc/chrony[caps]'; then
+	if has_version 'net-misc/chrony[caps]' ; then
 		HAD_CAPS=true
 	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=true
+	fi
+
 }
 
 pkg_postinst() {
 	tmpfiles_process chronyd.conf
 
-	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
-		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-		ewarn "This is necessary for chrony to drop privileges"
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! ${HAD_CAPS} ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && ! ${HAD_CAPS} ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
+		elog "To enable seccomp in enforcing mode, please modify:"
+		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
 	fi
 }
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 6d7a44f2f91e..e43d78736618 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -24,14 +24,18 @@
 	</longdescription>
 	<use>
 		<flag name="cmdmon">Support for command and monitoring</flag>
+		<flag name="debug">Get DEBUG_LOG output from chronyd when passing -dd parameter</flag>
 		<flag name="html">Install HTML documentation</flag>
-		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions or nts</flag>
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for hash functions</flag>
 		<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
+		<flag name="nts">Support for Network Time Security (NTS). Uses <pkg>net-libs/gnutls</pkg></flag>
 		<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
 		<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
 		<flag name="refclock">Support for reference clocks</flag>
 		<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
 		<flag name="sechash">Enable support for hashes other than MD5</flag>
+		<flag name="libtomcrypt">Support different hashes via <pkg>dev-libs/libtomcrypt</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id>
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index c5346ceb6745..fbc7bfac8ca9 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,6 +1,9 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
+DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
 EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
+EBUILD connman-1.39-r1.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50
+EBUILD connman-1.39.ebuild 2728 BLAKE2B 256d02357ade69efae60873880f10cf441be9e7f7e140d901d7faade82a9f8344b1817cf415f8de1bfb44ef5896a999d59953083d83d67cd33a7b79371f52bc9 SHA512 867d5fdaf2c5068722d2a4a0a1d884fdcd25b216ae6a52e87f41dabd1ca7bbeb8e29194435eb7772967572a822cef46d23403741c42a5a1d04027f7dcc5158f1
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.39-r1.ebuild b/net-misc/connman/connman-1.39-r1.ebuild
new file mode 100644
index 000000000000..9f5662b9ab43
--- /dev/null
+++ b/net-misc/connman/connman-1.39-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--runstatedir=/run \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable iwd) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/connman/connman-1.39.ebuild b/net-misc/connman/connman-1.39.ebuild
new file mode 100644
index 000000000000..6d08a5a9e688
--- /dev/null
+++ b/net-misc/connman/connman-1.39.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable iwd) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c9b749d441d5..dff55733425c 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,5 +3,5 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4
 EBUILD curl-7.74.0-r2.ebuild 8757 BLAKE2B 04230b4f348706178adc7d63a63c0b082eb46d1c5a9a7889af69d74fe32fed0308f736f7b87049470e41e2194d9c5277cd1ec7fa7aa21b6e1ba781a43df6f1de SHA512 8b57ee13c05d23b39e30c71383aaa2041f8603e5d46d78719dad303658573596bddd0a4fe9461d5d95fa9b8e90c6fba26d3e3874636dfa410eba8708d9c41d03
-EBUILD curl-7.74.0-r4.ebuild 8100 BLAKE2B 1868f61df5d74e36e27d394f608c35e92d3794ea45e5733e0c5cd96dcc2f07542ed3f64786315ae1b568fe6e2c0c7c874c5e8bc9f891fa3a8fed3d0430e3c809 SHA512 fe1fb8bddf62b9816636d199c6d04414c98e46752f6930d96be28a123e7a0a11c2a92c4e4afeebc6b693e668f0a99b9ac2479b7da55b5114b6518eadc5608080
-MISC metadata.xml 2032 BLAKE2B b9406f27a492123f45151d54e34056f26aac11aed12c8c69230f0a41602b42198d102edcdb36d6b890c818fc0b0ccce82b459e376f102d39a096646a17462475 SHA512 c33c12443b4489d36b9506b1a361547d5691bc0a6d997d5ae68869dc8f7936a6418b209bf80f61502c74e6722907c241d269089cb49b7c43a3c086dd52c8c16d
+EBUILD curl-7.74.0-r4.ebuild 8113 BLAKE2B fbe25717bdfc5f72378663c6ca5d789ed804f9f781b681021fe673ecbc8b6610529f04e9a85651fef8b06c82a705c90733cd0b0f87f8a230ee542d0476127271 SHA512 80c82de586872712446702ddf9a69971f378ce253ea2511a07a6d0daad756254cc543a64e47034ed4e08099210b06fd2bb432e1269bfbdf62c53c55a9d526a5a
+MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
diff --git a/net-misc/curl/curl-7.74.0-r4.ebuild b/net-misc/curl/curl-7.74.0-r4.ebuild
index a7f5ed1aa1da..07c50b9ce556 100644
--- a/net-misc/curl/curl-7.74.0-r4.ebuild
+++ b/net-misc/curl/curl-7.74.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="curl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
@@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 			app-misc/ca-certificates
 		)
 		openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}]
 		)
 		nss? (
 			dev-libs/nss:0[${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index aeae03a29a9c..63231cb33c31 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
 		<flag name="ssh">Enable SSH urls in curl using libssh2</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
+		<flag name="sslv3">Support for the old/insecure SSLv3 protocol</flag>
 		<flag name="telnet">Enable Telnet protocol support</flag>
 		<flag name="tftp">Enable TFTP support</flag>
 		<flag name="winssl">Enable winssl ssl backend</flag>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index be157659d3dd..db6c903ee66e 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 0c714c5b7d9b..3b88eb825ad6 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -482,6 +482,8 @@ DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.mod 34 BLAKE2B 7
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.zip 232154 BLAKE2B ceb6f5661851c0d00f7751a2a00eb625a1d23db8f8838559522f3ecdeba6cfc1ff0a374f58037e011a10e1afbb97244ec7cd6a9d1d822a28ba7d4e8a07782ce5 SHA512 7e566cef3bddee8b77c915f117814a4f2d3eeb3e2279f2e2c3eb72ac5e388fb2f9a9330f9ff3989feee0eea1a91350da1004c64080a722ba5b583b9c88973952
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.10+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.10+incompatible.zip 240615 BLAKE2B 1fa21eb0565b8246af022459f69842d22a48fc8f760095a247c0a06be420cd1ffff9d6b80fdb84a2c38bf9768178c3c96a09cb9e60a210f008a20197da94539d SHA512 a37f7980ee4f1893bf62be9dad1f1da2605167446906fc0b2c3382ca5ead188c5391aacfaad93652090a9710bfb23e954aac8d5fdb78fbb848538a8c42d5759b
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.mod 258 BLAKE2B 45e0afcb6b9fd29005ea523e2576e5c5e82f62095a8abb059e7a9b13de9e23d2cd743ae15ae8bea50a07d7c172b03836eea887ca5d381f947c50a655c2cecb7b SHA512 65f7f3695c82e7039187709df388db8049aff76aae334427e78cf224cce118835df370b4d59430fa87f652fb1f6980a92586a081e32c866159d42dd5ede26a70
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.11.zip 235364 BLAKE2B bc161f5839a1879b9f6b9b37dfa12aeadc5d776354b3dbbc3c3a1aecbbf60a40ebffcb5a192c31b1612c49e4f6643854172def6babe84636d33ce66669a9380f SHA512 d520ffdcf9a76b3d16112b38d1c1ebb376409b113aaa9c8be940e540cd3e9ed21ee5381bafaa26c88914c7a15bbc4b6e3eac9e0a28652778600cb46a52b6525a
 DIST github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod 37 BLAKE2B b725084a49db41d4011b5eeb41b04efed95731edb148e25aae8ffb93d2442f094c033c5090594a607fd7b292ce7aba297faac83a908dcce6edb38518edb3d93b SHA512 6c421a36f72cd46edc731ffd184180e7d1843df9f18d9d009d0555489672ce0182021c3b71ec4cb604b788745c7a5cb0066f5d53dddf129e0119ca62009b63f4
 DIST github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod 34 BLAKE2B 01ee764606aacbfed1d971205eade7257d4a1d34e93bf0e90748210bf06b4530c08ce0cb700d87cddffb1b16484a4d40501ca3f5323f6df5288927702c4f6169 SHA512 f9bc01067de82a71b0056851e1c1e982c0447de0a00063aee820366943deb29b12674778e3497f787e848299b7b3109c525ea183688c471300743015f41a6574
 DIST github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod 100 BLAKE2B 393b839b51fae48e56a7dc8fcb98ef846a08d9e30c2c8891f7425a2b849bf7959e41c042b6ebba5cb29dac002dc6d2cda4501e2bc23895dd6f2a2bdbab844447 SHA512 647bc4cb38c346aa84348c5ed67a091fdb36a68838935af0de3efb9796cb1df582f80336b15c2509f583a0a9303c30d1ef032dac62d79be014f3da53fc35df45
@@ -546,6 +548,8 @@ DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.m
 DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.zip 92720 BLAKE2B 0cd0a8533c87e5efd791cd1906f9d78174d66766a0763e8549bfcfa2ec8b81ec80119f207d34d6f71e5570fddd6e560745c5043bde4006e61a27a9fc9a7e4922 SHA512 db3f1af250c3d85b77f34158b85a7ba4a7023e5a1cb5ba2399e33584cc1d25d8c6352343c801a052c1bd1941e65e1bdec9c180363995aafc25e8989d4886d2c7
 DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201109091751-9a0e44181151.mod 96 BLAKE2B 04e650308fa90b302def593c55719704d32a45eb246f121dde9792f2104c95c7f2dd4b6f19d1f1df92d03bc7c86080c7a8023fd8199b7050cc0f47efdae46076 SHA512 a9077fafa4994a77d64856c62181625750de3e6a55d8eacfc783ccc7ad4c9a7c81eacc3b318405476f678d200fbca7a92caec57900d73286b99eb538e1bb690f
 DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201109091751-9a0e44181151.zip 93079 BLAKE2B a4ea161eb5b7662d941e3b54a8a1db50f5d8fbdf1c6acc9a8690dfacd46d3e7f8337d66ea27e865b30fe76dd582209c67776f4ed63092e5d1db73a6166aac720 SHA512 c55191f3f2797d253073c93856d16898638d21efb4a5bae14b3b37b2ce7cf3b9c5daec28e720da1982645ac5041544cb72749ef9ad53f7f8eb169829b1593849
+DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.mod 96 BLAKE2B 04e650308fa90b302def593c55719704d32a45eb246f121dde9792f2104c95c7f2dd4b6f19d1f1df92d03bc7c86080c7a8023fd8199b7050cc0f47efdae46076 SHA512 a9077fafa4994a77d64856c62181625750de3e6a55d8eacfc783ccc7ad4c9a7c81eacc3b318405476f678d200fbca7a92caec57900d73286b99eb538e1bb690f
+DIST github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20201210100135-17de26665ddc.zip 93506 BLAKE2B 876b1e6262e1a4434d3111169ac67b87c82a982de9036dd33678ebacac1606fd037844b83fb1915646b175367d773740b6ee346ae29db6fa2c2c7f847a0691d1 SHA512 7e5345f6597a4f70355ebc68185da9d4267ed4a5a2b6cb2b0baf9273ffa3ac6e7a1614825947bec1679ef9fc4a245a562277a2272e0a111a9c6b953d7071db5f
 DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod 391 BLAKE2B 94aca1aee200696b6ce6e6f5822ab7a4782caf4fb7667960bb310f2287ad01be0852f35b3d6181560422aff5368096eeac09e3101b7bee674458e91c97ee22d4 SHA512 d583e9eee3c61d44140f5a4f72d49292ca0f5ea059ffbf57a669133d0115d0c512918b1daea3213775bd7493aee674a4a81fa1092cf11b296a515b21e90bfa65
 DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip 209733 BLAKE2B 58c24ad8d11d7c934c49b7f4f95b6aee8e419c5c1c79ee33d847d8c5858dfb1002936ec7e9a4a5428524d8353b5002ab06d3950712435e19a904f002eb9ec42c SHA512 97f9ae2263cf95eaaa854d77181ff9f710ddc531ae58210ac593a569e738031b9c61e3bb6bf9cc0b1bff496b8eed4f48034544ff2378c85dbba67b8e4632167f
 DIST github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod 30 BLAKE2B cb0fc1336f2738d7d9c55f460d3983d043d78c13f79431b0f01530b780e27d3f44d7eaba3fc4170e60fb5c5a86b26a5a41f4e27fc3ba1c1cbb88ae23f5bce5df SHA512 729bbdce95d05166c0793f65ff5abe5178ffe5305a79d06ba2f447334ea9a13404ced5ccdf4d83b4782d88f46fb57b299750a14fd2cd16629696f5f7bc8a8baa
@@ -696,6 +700,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.zip 1486814 BLAKE2B e6bab87730bfe2cca4f99dc1c3f64eaf5669832cea698e2c30f32075e6e16d327e90218233d4f3ad5adc89f33d55e6bf69770f5f7028991a9637c34da79620e5 SHA512 ae017303434c1a795a75996482951482c04043074724c00ec6f4b879e5d8c7ec52292a27509cca0448bca4c5c3f478295febbb2a6dcb6ca5d86f67dd404b1d59
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201015000850-e3ed0017c211.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.zip 1525813 BLAKE2B 2ff412a2968531b27b5d06e36060f6261c0e0acc404764aa63293c2ddbe952f8276e5dbdb9f11d865082bae67576cc20bd80952bf9613888d8c82798c568e86a SHA512 09e338eb8465a416f9d52c624f06e1597ef785699f8d33d58d707abb6068ce1af182a950d5ae27419c62414929c94e09b0e672fbf7e9df3286da85aa47ac3cae
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -820,6 +825,8 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST syncthing-1.10.0.tar.gz 4909540 BLAKE2B 380d0e10085ac5960566fb5d72261f6a239bb1f738f3e4e712b4e611f4b736efdad0f92619c28b2387f3d280163f6fb5f3efb7d8e6b66129d1aeb6862f0bf210 SHA512 c47d48684c66ed3257ba8e6cb36e01375a9f132faaa27ef99a761a1420cadeeecf6e9b62d953ca2e71be174d17d715b7d65558eb7a4e5af05e5b6f2c1a31efc5
 DIST syncthing-1.12.1.tar.gz 5033468 BLAKE2B a2008d54d7da2fb9c0253eeece6f8c5de5ed5240739c168946d3908c2a77aa369e91ed13b98ad181684be6a4e752523eb5d7ee084704c01691b242d77b7b2e70 SHA512 1683bc9ae3f8ba1337a319d8f3ae5e809b9d437c96cfabf325c4da34fb2627af177ece7d365267062eeed7e48471aa94e76ea6034d02d8a09f1531e99c8ee656
+DIST syncthing-1.13.1.tar.gz 5044029 BLAKE2B 5a3fd774d7026eb530b09b8492d76ee8b33ad3e71da9df88f9d5fd74b1b53b41ac933bcd6d2d704f8859e407779e9818ba23ef12cdcc6fff572aa49ef0dfa637 SHA512 e0f59cd3e551b6d9d7889a63740114ac0381df93cd0d3ef997b7f474c26cee799b69cde1d32d924eb12a095f15e5102b786cd81a80af7674c41fe30e48bf129d
 EBUILD syncthing-1.10.0.ebuild 30998 BLAKE2B 301bb4b4a2f1e32d1811991282326bf73b40173c5647f0ba32871b9041725829d7ad447e634e20941c27d2d72f4330647e4dc7b75390cef7300ab866c9398620 SHA512 dc55e02a9d4fdb5a6c269d045fe37a2bd19abd17925283e664a924a883aeeb555081bb1903fce4bf2f9c8c8c9ba2a188f5ae0e25b79b7f09718fc5f8ca3ae325
 EBUILD syncthing-1.12.1.ebuild 40583 BLAKE2B 6e8eb52f1c49b55201de7a468418faaeac1c8b5a3cae9fa1cc61907e73a8eb07139c86500eaad20d3b7a9dcbeb8c83a53524fd0823ffcbc2bb60e09e67d2e244 SHA512 0c546718f1be33e51c8c9c481b7e8b00f3eabbf520feb14d51366da41d7c103d4a0ec478ceb2ba5315c4bb78b510d0196c368a5bc4f83a0849383424bb6780b9
+EBUILD syncthing-1.13.1.ebuild 40625 BLAKE2B 4cd3897bef51055a59906e948f0ab4fb76e7133130866db35734746c4c0833ac1bffdc02ecba8ce80194c09d841f1f654e069fcba15a840dccdb733eb289fbc2 SHA512 5f8954722fafc7ab1eaf1488fbe7eff1011426423378af72bf751df5f6dd173c3c0469142e1eabefecc456fc562489b6c0c09e9afca655ba26b85e295532872e
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.13.1.ebuild b/net-p2p/syncthing/syncthing-1.13.1.ebuild
new file mode 100644
index 000000000000..096cd25e49a7
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.13.1.ebuild
@@ -0,0 +1,797 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop go-module systemd xdg-utils
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/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/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.0/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/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/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/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/ccding/go-stun v0.1.2"
+	"github.com/ccding/go-stun v0.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054"
+	"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/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-semver v0.2.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/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/creack/pty v1.1.7/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/dchest/siphash v1.2.2"
+	"github.com/dchest/siphash v1.2.2/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.0.3"
+	"github.com/dgraph-io/badger/v2 v2.0.3/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/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/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/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/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.5.1"
+	"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
+	"github.com/go-errors/errors v1.0.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-kit/kit v0.10.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.2.4"
+	"github.com/go-ldap/ldap/v3 v3.2.4/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-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/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/googleapis v1.1.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/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/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"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.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/greatroar/blobloom v0.5.0"
+	"github.com/greatroar/blobloom v0.5.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/hudl/fargo v1.3.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/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/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0"
+	"github.com/julienschmidt/httprouter v1.3.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.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/lucas-clemente/quic-go v0.19.3"
+	"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.2.1/go.mod"
+	"github.com/marten-seemann/qtls v0.10.0"
+	"github.com/marten-seemann/qtls v0.10.0/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.1"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod"
+	"github.com/maruel/panicparse v1.5.1"
+	"github.com/maruel/panicparse v1.5.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/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.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth 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/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75"
+	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/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/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/nxadm/tail v1.4.4"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.1/go.mod"
+	"github.com/onsi/ginkgo v1.14.0"
+	"github.com/onsi/ginkgo v1.14.0/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.10.1"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/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/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.8.0"
+	"github.com/prometheus/client_golang v1.8.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.14.0"
+	"github.com/prometheus/common v0.14.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.2.0"
+	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
+	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil/v3 v3.20.11"
+	"github.com/shirou/gopsutil/v3 v3.20.11/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syncthing/notify v0.0.0-20201210100135-17de26665ddc"
+	"github.com/syncthing/notify v0.0.0-20201210100135-17de26665ddc/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thejerf/suture/v4 v4.0.0"
+	"github.com/thejerf/suture/v4 v4.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli v1.22.4"
+	"github.com/urfave/cli v1.22.4/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-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-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/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/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/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-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/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-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod"
+	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
+	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1"
+	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/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/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+	"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/api v0.3.1/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+	"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.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.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.22.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/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/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/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
+
+	# We do not need this and it sometimes causes build failures
+	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
+	domenu etc/linux-desktop/*.desktop
+	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/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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index dc7f7e227523..0a42dc6e5f85 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 5f83c7864147..2afbeaf95ef8 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -12,5 +12,5 @@ DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B ecd0a78f2c4a3a6006fb229a71
 DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
 EBUILD privoxy-3.0.28-r1.ebuild 3608 BLAKE2B dd2e6613f5b54c0dbf61b677415b56281de8eff1af08f85d92188ce0267c2d8e59095c109a38db4a1a7cbb33ca87f27c542d73637f81e272b26c243a199abd9f SHA512 91b810ee816d5ca3928fd6df7ae8124867970c5c3f7d8d7039f0e6f21b53bf00a3416d201a7ccee9b30afe3aa848640680b6d6af9dee7e19605fa90052bac2be
 EBUILD privoxy-3.0.29.ebuild 4092 BLAKE2B 3543ee150e312429fd436b27ba09a7352db65c6b0b492ab13759f56ab19e1c6d892496aace3105bbb29e1dd42e37ad1cc9f270b8d2cfc59c7f30b8a7d18960b7 SHA512 f4844fa4d43e442558463e7f3d2449e993cdd14dc011eddc34023c84c1230208b1d99f09ff9f8277f2cef62ea0c3fba574b50d1644b85424fd989e9564926686
-EBUILD privoxy-3.0.31.ebuild 3980 BLAKE2B 9bc509d224fe12bccacf8cae57c4fb21d0dd6a00b67cc357eef6d0e9c57b2fdc051ffe2229ea25e58c9bece3d8f75cfbd517f070c8a7b3e572d888d1d87b1c78 SHA512 5fa959682a9d386dfe5361563e432e7e31b5c394a8c94fddc15bea29a64d21f58bcd68646ebbd1dc2f07921423d96e0149759074a42f288b98603b9279f7608c
+EBUILD privoxy-3.0.31.ebuild 3977 BLAKE2B 4f0e20f8b797c36ae2229707348fd46d46be97153ff78aaf65eb0383553eb5a10b6b52aa27e0b5f95ecfff6119fe4b972c74c59d54697318c9d3dca389cf1dd6 SHA512 2eedaf57fb9bd538bedf032df3fa375b51157cc80888a6de6f3e084c52abc304c7a40e4e6ba1599c1a9b88b1f10e457d87db4913da00c677c0dfd551e183134f
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/privoxy-3.0.31.ebuild b/net-proxy/privoxy/privoxy-3.0.31.ebuild
index bffdf7a41b75..7fb333a882f4 100644
--- a/net-proxy/privoxy/privoxy-3.0.31.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.31.ebuild
@@ -19,7 +19,7 @@ graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
 png-images selinux ssl +stats +threads toggle tools whitelists
 +zlib"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 79c33eda829c..9acd40b390fa 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f0f6b9034596..6c954db1c865 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,11 +4,6 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
-# Sam James <sam@gentoo.org> (2021-02-06)
-# media-sound/sndio is not yet keyworded here
-# bug #769098, bug #769122
-media-libs/openal sndio
-
 # Sam James <sam@gentoo.org> (2021-01-19)
 # app-text/dblatex not yet keyworded
 # bug #766186
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 8e440acf7f65..bf38d957db06 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Rolf Eike Beer <eike@sf-mail.de> (2021-02-08)
+# dev-lang/lua:5.2 not stable on hppa
+lua_single_target_lua5-2
+
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
 # dev-db/postgresql is not stable on hppa
 postgres
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 735354c7acd0..31189e614c5d 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Michał Górny <mgorny@gentoo.org> (2021-02-07)
-# app-text/libgepub is not yet stable here, and it has huuuge deps.
-xfce-extra/tumbler epub
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-10-05)
 # media-libs/libffado is not stable yet, which itself has unstable and
 # unmaintained/broken dependencies. bug #746722
diff --git a/profiles/arch/riscv/package.use.force b/profiles/arch/riscv/package.use.force
new file mode 100644
index 000000000000..28b2d254c048
--- /dev/null
+++ b/profiles/arch/riscv/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we, kinda, need this on riscv ...
+sys-devel/llvm llvm_targets_RISCV
+sys-devel/clang llvm_targets_RISCV
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 332b00daa96e..420d7c754251 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6273,9 +6273,13 @@ net-misc/cgminer:modminer - Enable support for mining with ModMiner FPGAs
 net-misc/cgminer:sp10 - Enable support for Spondoolies SP10
 net-misc/cgminer:sp30 - Enable support for Spondoolies SP30
 net-misc/chrony:cmdmon - Support for command and monitoring
+net-misc/chrony:debug - Get DEBUG_LOG output from chronyd when passing -dd parameter
 net-misc/chrony:html - Install HTML documentation
-net-misc/chrony:nettle - Use dev-libs/nettle for hash functions
+net-misc/chrony:libtomcrypt - Support different hashes via dev-libs/libtomcrypt
+net-misc/chrony:nettle - Use dev-libs/nettle for hash functions or nts
+net-misc/chrony:nss - Use dev-libs/nss for hash functions
 net-misc/chrony:ntp - Support for the Network Time Protocol (NTP)
+net-misc/chrony:nts - Support for Network Time Security (NTS). Uses net-libs/gnutls
 net-misc/chrony:phc - Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface
 net-misc/chrony:pps - Support for the Linux Pulse Per Second (PPS) interface
 net-misc/chrony:refclock - Support for reference clocks
@@ -6316,6 +6320,7 @@ net-misc/curl:rtmp - Enable RTMP Streaming Media support
 net-misc/curl:smtp - Enable Simple Mail Transfer Protocol support
 net-misc/curl:ssh - Enable SSH urls in curl using libssh2
 net-misc/curl:ssl - Enable crypto engine support (via openssl if USE='-gnutls -nss')
+net-misc/curl:sslv3 - Support for the old/insecure SSLv3 protocol
 net-misc/curl:telnet - Enable Telnet protocol support
 net-misc/curl:tftp - Enable TFTP support
 net-misc/curl:winssl - Enable winssl ssl backend
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 72a84300f4fa..6bb52b91e909 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 3720f05b94f9..6ce373712899 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-7.29.tar.gz 5363181 BLAKE2B 4d3a5693a7b5939847c2dc32bff205649264766975c6313220e305770e40602f40e03c74db22e043860f1a2953a43e7ec0a58624f4882de93f3320a32dc6292e SHA512 e4133ad7a9b5e25f3c0bdd2397e02b6219e81f8632385e6423244e7c400ff72a5be85720f1ec123428ae3aeca79cac81e03b7f40de83d309e55ee69ee7cc933f
 DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654
+DIST gpxsee-8.4.tar.gz 8156963 BLAKE2B a2bbedf8a64655aad192cf436b762cc99f280f2bee32213a4d63476e48510b4a4697f474202aefa55d74c74e1f3eed48c58dc391aace1b76f431427e42a8a8c7 SHA512 8650e8e7d2bd4cef87f7a6554964b5599223ef2f69a64669c3e6f0fb25dabf93de9278d3016f4f141adb4cdd173a5f3812b7bcf147fd228765e06e23f066a9c4
 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
 EBUILD gpxsee-8.1.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
+EBUILD gpxsee-8.4.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-8.4.ebuild b/sci-geosciences/gpxsee/gpxsee-8.4.ebuild
new file mode 100644
index 000000000000..950a8b5cfcfa
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-8.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 128dc0adf611..182135420ead 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +1,7 @@
 AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
 AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
 DIST osm-gps-map-1.1.0.tar.gz 440480 BLAKE2B d1847937b4f9691c2ba14908f3cbca3c9911f76e05a6f8e96cd741ca291b74e238a06b6d01fbd8bac9c43bdd73788e8ef0c035d75290ffb631a15ee0b9f749e5 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0
+DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
 EBUILD osm-gps-map-1.1.0.ebuild 899 BLAKE2B 52bc75f8caf261415dffc1d7bb4f5256dbc9ee5c1e17cf52020b91b15ec365f09e19dcff5cce697137c54b50751511a44a54f0d18d8685c8e24a5de9b4ee59c8 SHA512 c868f9a711c0ce574376954499a68ab05411e136eba282be7fb7668a89262e1fb2eae2e38ec30c513a150c76f0dd07fdfdf95e274c2d77daedb545077cb61363
+EBUILD osm-gps-map-1.2.0.ebuild 921 BLAKE2B df11c52257beb538b358becad6ed0fa8baad921a08298641d0d757be324fddc7f2c4ab272f7a5d548c7d498ccc6fc8017670f9d1576adec990dfef19502634f4 SHA512 2d8d003d96da69902d612f7011e01a9d606059bbe505ae0fc9077a231f869996376e312423a2af5385cb6b111f44c803292b33eb0589d273d864e6e2c87ef9a2
 MISC metadata.xml 327 BLAKE2B 33d0eccf4eaefa31ad6a2a5fa2aea8ac9a03e9c423c8c96400c4a6921429886bcba4c388f8ed739af67673bc00cc07a038b4664a23c6a808b1b9a699866860c1 SHA512 67dd8500028be31b9bbae47ea255981f82762bc6a1c2a98b1d76c04e09e3bd794bdcac589e09c9158425e9ed8500a2d8d02d5add82e5d269848ca19b4fd299ea
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
new file mode 100644
index 000000000000..c3e71e3e18e0
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2
+
+DESCRIPTION="A GTK+ widget for displaying OpenStreetMap tiles"
+HOMEPAGE="https://nzjrs.github.io/osm-gps-map/"
+SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2.16.0:2
+	>=net-libs/libsoup-2.4.0:2.4
+	>=x11-libs/cairo-1.8.0
+	>=x11-libs/gtk+-3.0:3[introspection]
+	dev-libs/gobject-introspection"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common:3"
+BDEPEND="dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-gtk-doc-module.patch"
+	"${FILESDIR}/${PN}-1.1.0-no-maintainer-mode.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable static-libs static)
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6b79ff1d3426..2b7a4b3e2d65 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 74b7d0879289..0701d1dcf505 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -3,7 +3,9 @@ AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab16527
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
 EBUILD linux-gpib-modules-4.3.0-r1.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
 EBUILD linux-gpib-modules-4.3.2-r1.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
 EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+EBUILD linux-gpib-modules-4.3.4.ebuild 1346 BLAKE2B 8b66209430fb62453785e8747c3ec988e20000137b034c1f28e3e85a306e0d68b2dfaffc8ff0d011f9f3c870004f10b32f25b75024063678f96b0b6ad7305380 SHA512 d57b9489fff12bbbc1838a628227e71e42d3dcc611885e02f2caf1e7b95666f29b01c7e602ef704c36fd48ce8740ed0a86b6927d1a501446092d028c641923a8
 MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
new file mode 100644
index 000000000000..12044c6d1c24
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	my_gpib_makeopts=''
+	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts}
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts} \
+		install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index d5fe8c08f2db..38959c6acf2f 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -3,7 +3,9 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5d
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
 EBUILD linux-gpib-4.3.0.ebuild 4791 BLAKE2B 8e0d7ea05b242b60a6c60798cf60ab75b2e5915782ab0f8d269fcbd74e353fbbc358ca3bc0c42a4fe51e4fb6965e618a2caf74849ebf00ab769e075001f7c502 SHA512 aa12ce276ffc241ef5c60659ea52b15a3b2186b3869e17ac74ac9e30ebd2b38bb59d62920e2c4381c1d90783b8f9d187f2d0eb1237f70a74fff391201febfdfe
 EBUILD linux-gpib-4.3.2.ebuild 4792 BLAKE2B 1c733c05bd35cab2576b903f0fc0327fc8b28ecd774600b918b209e58288fdab14a5e915531d1de7f87e660c6957463d9c8823a0ef170be0992138fa370b5502 SHA512 37829bf5264ed12bbc98d721d80728632b91e00334f6e69711824810725a007f73f52174cb8e8c4d14d255f3e58d249fef638186c75b603ba3018290a72b0e3a
 EBUILD linux-gpib-4.3.3.ebuild 4792 BLAKE2B 1c733c05bd35cab2576b903f0fc0327fc8b28ecd774600b918b209e58288fdab14a5e915531d1de7f87e660c6957463d9c8823a0ef170be0992138fa370b5502 SHA512 37829bf5264ed12bbc98d721d80728632b91e00334f6e69711824810725a007f73f52174cb8e8c4d14d255f3e58d249fef638186c75b603ba3018290a72b0e3a
+EBUILD linux-gpib-4.3.4.ebuild 4798 BLAKE2B 98352a097c293f77d0dd897294a45d6a5b24097aa96884b0aa4377d543ae0d5463cd0988d02a3285b3b1aa065e888be69145d34256beb176020cffc6d75f2f74 SHA512 c48021a17547e256e25fda080c03d0fa31948d746a5bc27c9d888a35b40d09285187a25cc8868a2660b72eb1011f66dd73bc9bc7010c0a1375eb6930de46c66f
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
new file mode 100644
index 000000000000..20f31d537548
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation)
+}
+
+src_compile() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		docdir=/usr/share/doc/${PF}/html install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		DESTDIR=${D} emake install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# fix rules files
+	local f
+	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
+		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
+		sed -i -e "s:${D}:/:g" "${f}"
+	done
+
+	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 540aceca8983..d9709f4e9c49 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index b170e84ccdcb..dd3f2e1b98df 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.4.1.ebuild 1139 BLAKE2B 9f94cb92c33bb2ed0d3c4ccab96f4469386e3a812c5f636ad5979c4035e3a5a77a75225654c8519b2691e1586116d418da0952944a73381b2df029a2ee4ac261 SHA512 36984a98da1a40251109bacb8d7a7eda097bdecec2f2caf32edd00ff63e3372d811cdd59e78a4ca667890475bd3f83bc4b0e6f9d0a97797d74b907f5f6b73fad
+EBUILD bubblewrap-0.4.1.ebuild 1138 BLAKE2B 5607d1645cc81be516dac6146c6aa45fefb69d66137af886048664fec1d73f4cf00835ee9d7a21e72f93acc9ee49b9d079f6dbf2ce70f400eb9a6487a437dc31 SHA512 164790de09371c07d7df7311b022d9dbdb0cf28333152d96c0906d2966fd63aae99b7e6cb139efda2e8903b27302ed9d74a7e1071a6e4eadc42afe5f70dcb2ce
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
index df71b56f75f8..bcd591ab652b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b58e88e1c504..af0b0ff390cc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,7 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15222 BLAKE2B ff9dd3e5ffbe8332b51b82416b1320b6ee7c7c4ae6c3d20ccc85b18132a6d75ccf3c999b35d54c22b94f8828f40ba34c880bb123caa2840d25ee009a5d56c9ed SHA512 6e81ffa68802db9b576391329557ce3223748889e74ff3868deb170411871639d293b38b7c294c1ea7b075b603e86cb803655200d26b01edc0d9a6d054439b34
-EBUILD systemd-246.6.ebuild 15256 BLAKE2B 6efda811fd51a44422163fc03db22edf7babaf9d4c11ea2b7ed09cf4a19e428c71c45bf1fb66bc4e85f0ebf8407e04480ebd181788880df9fe873f0c5a2f3fcd SHA512 a4ffc091f56816e44006205894ab59d715c08622a05f7774803f971edce388d876815e0c068e7f708e420111b3edd000b8edadb21dab56dd8e9d747f111772dc
-EBUILD systemd-247.2-r4.ebuild 15594 BLAKE2B 326270b0b1f1f6b2841d24fdc7bb0f62c2121d8eced261213dd445f9ee3eb4a72164aa7fba72c8e36acc5874b4121086db4b832d6ee7843168af2f21e88a54a9 SHA512 dae24223785a42f50fda8c54da16498664228c3459aa87d970de00fb5f702405625d0bcac37511766ec2ae3dc779f9697e6b18e7feba5a4371e0478a0f9132d5
-EBUILD systemd-9999.ebuild 15594 BLAKE2B 326270b0b1f1f6b2841d24fdc7bb0f62c2121d8eced261213dd445f9ee3eb4a72164aa7fba72c8e36acc5874b4121086db4b832d6ee7843168af2f21e88a54a9 SHA512 dae24223785a42f50fda8c54da16498664228c3459aa87d970de00fb5f702405625d0bcac37511766ec2ae3dc779f9697e6b18e7feba5a4371e0478a0f9132d5
+EBUILD systemd-246.6.ebuild 15282 BLAKE2B 16b7fcc621a922589d62278289460eab7a7edf4520c5297947a2c36a6861b7444f6bf384ff0756563c9e454718176c7258878fb4ba758ffe74bdb6edd0c88a9f SHA512 de1cef007b466bbf98057f9fd9fdfdcc0bec655b2396205b19bbaf6c698663c9f3b4b0ba4352fcf5700168c4e7aaacce5c1e6f15bb2d4c961e7a4e254971539d
+EBUILD systemd-247.2-r4.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
+EBUILD systemd-9999.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
index 8bcb3fab7dd2..52ae9bc4baaf 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 543242858842..abf3150703d8 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 543242858842..abf3150703d8 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 7ffa9753f686..c1b60558300c 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -4,7 +4,7 @@ AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b77938395
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
 DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
 DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
-EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
-EBUILD usbguard-0.7.8.ebuild 2059 BLAKE2B 9dfb64b540267df979a03555281852ae50b702ec64d21fe8b72f9fabb9cc4d4c6c9203ba86c2245ea54833b1aa647625a85ac29dda9db335b7e677a0db865ca2 SHA512 9e382c96108b99636d729d37ced81561895ccbbb85971a5a3f42bfc02dbd00073f8d999d8fd3320a0769e808f71aed34ebb4749960985f928453dd1ae49421c1
-EBUILD usbguard-1.0.0.ebuild 2094 BLAKE2B 510b7259924cda2a6ed12fbfd196b6ac2ddefb42e7d416d6bb1887ed5b03fb9fa643bbb0eb25555f34088e256a19d8ee37a65484aa4f5d07ba197e0cbfb15cb6 SHA512 3b57af8206eab8940dc7feeedeea6ff102dadfa175f9c64eb59f8791c6f42d2525da6c40624ea19bc21750db3c3e6bd1f09bfa195a6274607d7a6972003ba3ab
+EBUILD usbguard-0.7.6-r1.ebuild 1910 BLAKE2B d708d26de6da007518ea857a9d8852d3444cb76ce688eebfeeb9f27a7bb182a2ab847db3259d1cc2593f8b5a87e1169c69ae33fb5114e18b117e357228d5d925 SHA512 8d47d66b6d022382610354e744d3ab18fb595391a4a9a7285809816763988e126cc9a50d3f1c6bb8293942de00fd52be3c453c8247a53749ec0fff3b1c3cffb0
+EBUILD usbguard-0.7.8.ebuild 2062 BLAKE2B cf1d12238d7b2b846119fc11454347cc92cb550aa404fbe8afb3364c29b49abb444f4cbf559eb3aeda68fe0f73ba59f134a7d4b8a947f81687e14a148c8bcd06 SHA512 e8efc8156d5b5d565843baff754b70a12dabe43aa65f2090249901fc088587821fa6b5fed7668933105319cf58a22576764b4cb43e688ce142ee9e34a604e916
+EBUILD usbguard-1.0.0.ebuild 2097 BLAKE2B 3beedf6ea7f458709c9c17b2adea4ca093bf43ac61e8c7bb13c5c304dbc504d8c4360c0bac27b46b6d78aed1dc0c9cf65e8bae8c62737f16e4a88ed1337790ce SHA512 dcb5cf654755cbf002078344aef9d645fabf69a98246bc68f2ff97a0247c105d4a2cdf8d5f307386c22af3823d9fefa87d13ff4df5b1f60f09b81cff11ade144
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
index aa7debe0b591..3f76442a7df2 100644
--- a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="bash-completion dbus ldap policykit systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
index be1f9ae5b840..cc4ab8ff6f37 100644
--- a/sys-apps/usbguard/usbguard-0.7.8.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.8.ebuild
@@ -17,7 +17,7 @@ IUSE="bash-completion dbus ldap policykit static-libs systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
index 78b104813dad..1f69b3df6b49 100644
--- a/sys-apps/usbguard/usbguard-1.0.0.ebuild
+++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild
@@ -17,7 +17,7 @@ IUSE="bash-completion dbus ldap policykit static-libs systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index d996a18f175f..c685a31f8846 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 558 BLAKE2B ac4db5377d7832aaa98a0c2cfde0f2d27637c0e18f6b102633f91915d08c0418895c3d9a24276065e171e5b4530796193c06d50aded45dcd934d7d8c86b42cb9 SHA512 f0de023eddc0c64810a17cc98d6a4ec9369fcc767327666bb88e2f88cc0dfbd4d39eeb3532fdb1edf1f2c2ecbb9d60d32c788613d1bcb6a56c6eab9cbe16f1f6
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 557 BLAKE2B 1c1d0372bd221e2f0a19408685ed59097c3123c0dabc581c25b53d97cf42558596affa4752a5d3d0f29bf03b0227ccb762b2800bf423dd10ee3b8aba58b50ffa SHA512 8104cd566a1da457eb8a693e2ac212ef0bab0684fa32cadbde4c308b849a225e91afa3df4476b8641c3458562271033d3c7546f0f21b9e433ee3e0bff8fb4d6c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index c7971f014d42..61cd561b7241 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 2c68bdb4464a..ee2d45176a76 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 189ab0d7fcb9..ae26c7281d92 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -5,6 +5,6 @@ DIST tzdata2020e.tar.gz 411619 BLAKE2B 64eb26fefa4579b731cdf0589da4be0e17587f34a
 DIST tzdata2020f.tar.gz 411739 BLAKE2B 703a8c899e76d2e8f6660dc077a92988dd69ae332daca5246cde9a4972688ba0244badd735ab3bc7537b00d44af151d95ee8bfe216028825577cdd953d455767 SHA512 dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca
 DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
 EBUILD timezone-data-2020e.ebuild 5380 BLAKE2B 2f058ece71e2feb8e3db2ad1d09822ec3e32befa081331a2172f451fd84c8674a572aa5433d93294003701bbf94e6bc7d9b8a66d169b5d9f8580b1c9b801ad7b SHA512 a7beca84f4b2d34d602dc68a7a73b0ff64d35e8af4df415e7cbae135bc219d77ab38b62e216c01dbacefb978f7328d9e56a7c68bcec7d5d69950013caf55d6d8
-EBUILD timezone-data-2020f.ebuild 5384 BLAKE2B 23220e709abcc2287baab13bcc55cb5ee24eba99a430511617b712b63b5609c24f0117ced0f26d3fedb174f1db9cd2ab00e26464b9a785ed863b78dc65af537c SHA512 a7afce8211821124838c677a408f0ef8df6af4c2df8f4eb249f7a661f995f182d8a655a3a3350bc49b0f54c17b6d3c40a2b16ad44ad3c93c272ed57e74dc30ee
+EBUILD timezone-data-2020f.ebuild 5383 BLAKE2B 47ffff70ed5c31305027ce31839c24379270e71ca8ff18ec6721f6843bfd10440d6d87767fcf00837da7562ec62d00c9b60f942ccc4502509f2b1679a9219733 SHA512 ef9c72cf09146aa8b7e72e2c3da2ea8ce55cddf290ae8efcca40d9bbc8317eae9f0e36119a0b9f91e0c5c1e39f6dd652f8e89307465403c99f5ce3d1ce9ded53
 EBUILD timezone-data-2021a.ebuild 5389 BLAKE2B 24b380342dd1de1943c96608762177926595954e4ad683f92b1b9fd6f77d65aec5f27aa97202c4e819e0ea77b0fc4187c2ac8f12dd6cd44f49d7e254d8be8b6a SHA512 734817e9fd7f2ef4429b314e41b25853d9d024f3a502ec6f6ef2c0c0067311a3db1fecd29fcbc1428a1af3e07fd854c76b3ed3162cad3c90b384cf89828debec
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2020f.ebuild b/sys-libs/timezone-data/timezone-data-2020f.ebuild
index 39ce0eb4e831..fc6d375ee885 100644
--- a/sys-libs/timezone-data/timezone-data-2020f.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020f.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 56291a7eb626..14833f7b316b 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 6c4bf4cd35ba..97e24cb38674 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -9,5 +9,5 @@ DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f5
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
 DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
 EBUILD audit-2.8.5-r2.ebuild 6394 BLAKE2B 67680357d0352fee8c240953f89921860f41e1689b9217bc3b2ca275022c40282d6034682bed9ee3f98be586d03f7bc62ccff59f7e554ffacde6c275207ebd0a SHA512 f82d378a722426f1997f9696c0ece61100da192577981a9f9ada1a94b8c50eea12ddf0c036d3b88b1f0effbdc4389e9bbb1977867e5290850fd9bf32e337f699
-EBUILD audit-3.0.ebuild 4189 BLAKE2B e74be013ef60a7d4c221ed9a57c9cd4bfb70ed2bf1a71c9ad1488e25d97cb59a75a02b250ba7a4088e947325a0f06477dd8fa37e2326b65186cd7b2546eafa90 SHA512 68f76df9c070606236f552d19e994c9485f8b409149aa3fc96f03c41c33d85bf5701c26ccd38e4f8826bf1de79d4954b7dd6c6a0be6eaec87df9c23400f7b7f1
+EBUILD audit-3.0.ebuild 4188 BLAKE2B 25dd4922f4c9bbbf56f0cc07f88119917daf3793796eeff0a5bc961b0f7e599ce573afb9ceb915155d2c94ae2c09e95e586c47767f525ea129d1167f586a4684 SHA512 a0cb370b44d4d93d8e45e1d8b003eb3a269ee2bf0baec5f864991cc26c016853b8b7dff6078f2090522b5fd8a911145d495fa5b8e4660e8f9169538c60b871a3
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
index e9271cc0f705..3cc65537341a 100644
--- a/sys-process/audit/audit-3.0.ebuild
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
 IUSE="gssapi ldap python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index cb1d9e9cabdb..51fbbddc048a 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 87b9b4d69ed2..5a888efb2298 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,5 +2,6 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
 DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
 EBUILD mod_wsgi-4.7.0.ebuild 829 BLAKE2B 4dd9357ea7c77c5f881edeb7b625d8995cdcbabf8c4750013aad2fc08df0821611c60e924b2543337b9238f21f65fb3e0a87fd9233604c4bb502cec0993b8208 SHA512 c0321b58f1340e92cc11a41760b17208f4aac337590c6fbd4e0d76918c732f3523091ed9d9399787f151efcfd937a03d5a553b5d5f7e3cc077a24b203a76a736
+EBUILD mod_wsgi-4.7.1-r1.ebuild 1242 BLAKE2B bf2517661deb7bd62cbac3b928480d57cc7796d2085f97f5da2194871b48abaddfb09bd812efc6d3f1041417430350ce2fcbdd5578f3404de6399fc0b77175a5 SHA512 1b13d3e0e25e4eff71e5b69a67cd3d40dd416d8ce3ec54755ca92b4a6ba6838afc09bd32a2722c7337931c85515abd9874798def529ef097a0ce6a780324ba39
 EBUILD mod_wsgi-4.7.1.ebuild 1235 BLAKE2B 4a54f43d7e8224caa152fe2b48af6126108ad74c2b3ebb5b38eb99127b2f741f1e54cb6237a852fbbb7d9c8a5e3b8253c227d507bd2fabbd02e3abf87ba13138 SHA512 132ae2a81c61c7e52615313e503b233d498dd37b65103b4be906f1173c178169ee66158bd25c1178c3da1ba303c37b646494d2942893f265533cd0cc04992e42
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..609e961c96ea
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	# Calling depend.apache_pkg_setup fails because we do not have
+	# "apache2" in IUSE but the function expects this in order to call
+	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	# configure.ac contains bashisms
+	# (https://github.com/GrahamDumpleton/mod_wsgi/issues/567)
+	CONFIG_SHELL="/bin/bash" \
+	econf --with-apxs="${APXS}" --with-python="${PYTHON}"
+}
+
+src_compile() {
+	default
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 6118c3743ab5..ed239af711a8 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index d58eaa2a0f5d..f6469a0b818a 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,5 +1,7 @@
 DIST lightspark-0.8.2.tar.gz 1996482 BLAKE2B 09ef5f4bc4e78efe8c8ddb305e0c47091ba5b27c9b3bb2dd782079bc05a4836d43a80b47d1c30eba424b5d43a724502235a60c08451df4c8526b15a32274dbb4 SHA512 0ff636ad59523726232d9c2105843dc9ea835526c300bca7833e6d1a0ebf7630c1d10109143baabc16f95c1c954094603c945b705a6c9fb02f369e94fead034e
 DIST lightspark-0.8.3.tar.gz 2374990 BLAKE2B 3053ca1ce8a8c0b7e243d28c038b237647e86f72a0d4e171da338384e4228587aba21f141fe0656ebe8243343284afcd311d7ced22cb09f95538e2f618edfefc SHA512 023d1872577445a857c77908bc2ec83ebfa086bc77161dfd22b53fc0c38eb5d94cd5bb5c5a7508dee2039d3b8479c917dcee089fe551a984ec5525a5ae781997
+DIST lightspark-0.8.4.tar.gz 2412232 BLAKE2B d749713db4dc14a45f57cc75b252e3b70e761d42ab76ab0c23afd4c85bbbd7cc5fea5f3b6e53cbbeccd79214b0e1983d0ab86acc4ed58206b5c4a2371487a40c SHA512 a69a73b6e0c5227bb63e94c15ffaa83df6ed18d400c50fd6f845b455d2b49a1acdc45f1f75c14894492ba5db9e38d1fbbac315359d4b73434832c05873b22091
 EBUILD lightspark-0.8.2-r1.ebuild 2553 BLAKE2B 52445e714973731a9564d13dd00bc6380a6d342231f8bd6e4c84fea5af9b63ca9e7d95b1ec2fedf8ed441c4ac71d5bd9dcf4dff3a324f8ea942fa185fabb47c0 SHA512 f613c52de3c45db9af125cf90937ed1b0e1c5e993f66778a22704f7e546b138de13fc34388868554af96e474749829588fb11ff58d7a55533fd1a5439b5547ff
 EBUILD lightspark-0.8.3.ebuild 2541 BLAKE2B 468dfd3a653d10bd4192c364f64a3a901f7dba7e7d7e142eae95e5c278079dde15dde8b9bdc420b504b50937c9b7bad895415dcfa9d33368e2b993b31ccd012b SHA512 27628b4e45bebd60f3ce1d0a5b219500b716fadc7224b442e05ef254136a3f7488010468c9cbef0401d56531a6d9ee6c8b1a189ac596d47c9c7deee1b1fecd29
+EBUILD lightspark-0.8.4.ebuild 2522 BLAKE2B 496c7d0b7cdd41cf0569bd2f3e3f4850cfed22ab942f6b9e4e9d6fadc3e9d428b9dbb3d0efb4b0591bb70e29f1e0d19cfbb20867b1dc3465a011fb8b15f329d0 SHA512 80ad94faf0cf3cba45ca8be29475642370ed04c98ff28028aaec790eaaaf457089bd5ed64b4b940dbc7be1ec92a91011a6c5625db67466a95185db62c0d39d50
 MISC metadata.xml 728 BLAKE2B c6a146e670ee88ef726ea394db7572b0ce014be4e33e0a1bcad4bae1fe7083fa9ce41f4c2817a3b7c09a43b8da4738d011f082292e1f38fa67f2ed5e078889fc SHA512 a18594a062a2014f0353d0caa72def28333ff34f8e211cd42f8dc9a192b0173a203ee16605e9bedbbac0989a72f64b88584a4e9e6c28d197fcbc83e296c46af5
diff --git a/www-plugins/lightspark/lightspark-0.8.4.ebuild b/www-plugins/lightspark/lightspark-0.8.4.ebuild
new file mode 100644
index 000000000000..1093cd420297
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.8.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake toolchain-funcs xdg-utils
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="https://lightspark.github.io/"
+SRC_URI="
+	https://github.com/lightspark/lightspark/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/${P/_rc*/}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 curl ffmpeg gles2-only nsplugin ppapi profile rtmp"
+
+# Note: no LLVM since it's broken upstream
+RDEPEND="app-arch/xz-utils:0=
+	dev-libs/glib:2=
+	dev-libs/libpcre:3=[cxx]
+	media-fonts/liberation-fonts
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	media-libs/libsdl2:0=
+	media-libs/sdl2-mixer:0=
+	sys-libs/zlib:0=
+	x11-libs/cairo:0=
+	x11-libs/libX11:0=
+	x11-libs/pango:0=
+	virtual/jpeg:0=
+	curl? ( net-misc/curl:0= )
+	ffmpeg?	( media-video/ffmpeg:0= )
+	gles2-only? ( media-libs/mesa:0=[gles2] )
+	!gles2-only? (
+		>=media-libs/glew-1.5.3:0=
+		virtual/opengl:0=
+	)
+	rtmp? ( media-video/rtmpdump:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_LIBAVCODEC=$(usex ffmpeg)
+		-DENABLE_RTMP=$(usex rtmp)
+
+		-DENABLE_MEMORY_USAGE_PROFILING=$(usex profile)
+		-DENABLE_PROFILING=$(usex profile)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+
+		-DCOMPILE_NPAPI_PLUGIN=$(usex nsplugin)
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+		# TODO: install /etc/chromium file? block adobe-flash?
+		-DCOMPILE_PPAPI_PLUGIN=$(usex ppapi)
+		-DPPAPI_PLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/chromium-browser/${PN}
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use nsplugin; then
+		# copied from nsplugins.eclass, that's broken in EAPI 7
+		dodir /usr/$(get_libdir)/nsbrowser/plugins
+		dosym ../../lightspark/plugins/liblightsparkplugin.so \
+			/usr/$(get_libdir)/nsbrowser/plugins/liblightsparkplugin.so
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use nsplugin && has_version "www-plugins/gnash[nsplugin]"; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 370ac7e19ae6..fbc9e04a2a11 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 3ddbc41b9323..04d4c03e1152 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,3 +1,3 @@
-DIST grub2-theme-preview-2.1.0.tar.gz 198805 BLAKE2B ef0417d49462a78678abfbcaa6b2ad31010cc033467c76291be8f66d4a3e412ac6d015ed4ff55a4aa557e7ed5a7cd33d25a2dd04111fe1ee78af413505fdab78 SHA512 9e8f21b5b84e2564654ffff84149f8421e168bc83c39ad9adf1ba0522de3b3d041c4be3853c6749bfa4d0693e629f43f359724c14b652a599f9c202fe00ba6b1
-EBUILD grub2-theme-preview-2.1.0.ebuild 742 BLAKE2B d75341c87a8ad7b5bf49c1ce6e89def1ee34500a40cd8dd716d08b7f468ca5c5d7de615dd235847910b97890f5ed05ecea93d811f51f1e3396e9eafcc25d1d93 SHA512 a61b1c4946a74fac0cb78ac8b8a8dc129e7dc1829822a6ade2c6121da17f197cb76ab01c3aa526742ef2c8e2ba9eae6c31dea478e59ca211bbbccb31567f75f0
+DIST grub2-theme-preview-2.2.0.tar.gz 198843 BLAKE2B 82c0b424cb539d62206b2875ddecbd7bad9796cce3e0ae2ff1b349f382bf39a096d24f3b4b47f6efd85638dc8823a1961b409db7928411858e6e6f593efe6993 SHA512 4906fe5ec60da9a6ec78dcb74897a08b672d52c8f9386d1fb1b11837ea244a0a4ed3a389a15ed83baeb2de7ee602307a96a29e147a6169f301c59078c1f5e376
+EBUILD grub2-theme-preview-2.2.0.ebuild 742 BLAKE2B 90d36974cc5e63331c4db7650be13e6fe14324efb8448eb9ca98e952fee97b9a8776fd397a0312c3b320a37413f1b3b89e3619dd45f9244e7a6bc168b565e8ff SHA512 7a512df655ebb8f4ff51f2ca07eeb7195230924e04cc0e1d8f78a24e52bf9c54031f790e84c5f32a0ef7ca427d8fde734205b32dcee45a3f3265790382bcda91
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.ebuild
similarity index 95%
rename from x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
rename to x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.ebuild
index 7cbfff411c31..35f557913322 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 6e1952370d0b..6b2b9838224c 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 9e7b62ffbced..30cc4bd8895e 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b
-DIST xfce4-hdaps-1.0.1.tar.xz 351780 BLAKE2B 466e83fa65281db0cdb75396f84714896b396c6ba08a037df7bc02099a5daeb9cbdc5b012954866a1873b637848a3fe8c1bbde56ea4559f7c60b34053b4451ac SHA512 187daae3422b06f001918f40990bc38ba4de41303390d80b605c2d73b418d6a44e92b5e9f812b090f9d17fd9684b7485be4713f10d9946567a310e71eda8277c
+DIST xfce4-hdaps-1.0.3.tar.xz 350936 BLAKE2B 37d80bafa831be68b55f66c029ec120b67ea1a21760291f05cf11587161b295698a5994df3abb9eaa2c3ff94af7b0f43a3cfd04cef31993d741918b4eb7e8f49 SHA512 9263a6d63b4e4cd9729a87ae5150d10a6ef3a2bde48b5a82334e948d884869ed2492953eaef4df08b6a2155454ef81af6b83e70f1436cfaca4f2fd8e39b5ac34
 EBUILD xfce4-hdaps-1.0.0.ebuild 812 BLAKE2B 7c1212db7794e5a5f274175110a51d0929f0a5c9782ff4e0bbac111e902a23948130aaef3684621724c07379ba0280c8169020cd9cb31f7e0f60feea54529159 SHA512 7ecd673d2ee4c3df5e61b62933c35f37bba522cc09236db0453bc12c99697dbc1106ca510650cec1793eab4e96d25785a53a2446e4f639642a990533c66ee413
-EBUILD xfce4-hdaps-1.0.1.ebuild 814 BLAKE2B c05848b59d3ba36a752c296d605dd16b1de0f9028b955e9461705d80b6c9f64380cf70900528a71a2d150b6b38841856514d3cb03ddf801a9c5c0e4fd30b69fe SHA512 2c068fcc61ee5b08abb13e45f01afbb68ec1270f9f61be917eedcc932bc6adfd423fb420533e5fbede32c001daaad414423b56ed82570062c240a9e79262df13
+EBUILD xfce4-hdaps-1.0.3.ebuild 814 BLAKE2B c05848b59d3ba36a752c296d605dd16b1de0f9028b955e9461705d80b6c9f64380cf70900528a71a2d150b6b38841856514d3cb03ddf801a9c5c0e4fd30b69fe SHA512 2c068fcc61ee5b08abb13e45f01afbb68ec1270f9f61be917eedcc932bc6adfd423fb420533e5fbede32c001daaad414423b56ed82570062c240a9e79262df13
 MISC metadata.xml 360 BLAKE2B b052657455cb7c1296e68df21944f2331439161ecbfd56b0633323cdb3afc82da8b5b66ad6ac862ef107643ea299b844a57f6f7faa50f83917a3dbae06c5ff4c SHA512 9b00df4ea0e92b1b12cfef2479bca9dc2742df3e8bb0bbfa1b633c3e3aaeeda5cee0add8cb64c30e13d82166a36bc3010dc91571c05d5d3d3c55973ac1981b23
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.1.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
similarity index 100%
rename from xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.1.ebuild
rename to xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild