diff --git a/Manifest.files.gz b/Manifest.files.gz
index 498efcf2b2d2..b6f6faf7bc3c 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 314f676e8cb3..104ab690aa56 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index daef9d30145a..f13b50eed67b 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,4 +1 @@
-DIST lsyncd-2.2.0.tar.gz 81034 BLAKE2B 26666d04729e31d60ec340c207d5c22b2f53571a146d3f548bf7a33061bcec59aabafae40242f79a971297780fb7de56b5ff1fbccdb4c2152878f1b318a058b9 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81
-DIST lsyncd-2.2.1.tar.gz 81005 BLAKE2B 797c225b484139df53d3d1173d0cc3b4ba632a076e937902799247e422643f0bcefe22570d311afb4c8fb98151467a1ab624a97f728c851c02bc0dbc601f2238 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5
-DIST lsyncd-2.2.2.tar.gz 82231 BLAKE2B 44cb269e1b726595b4332471335dc2a600efa2ebd39d7857d9c0c4adebefed923f60b177511e9e06113a4ff3400e45a979315bcd61169a7a2b9945b1aa944a86 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0
 DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
deleted file mode 100644
index 76e01d5bcacb..000000000000
--- a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,4 +92,4 @@
- target_link_libraries( lsyncd ${LUA_LIBRARIES} )
- 
- install( TARGETS lsyncd RUNTIME DESTINATION bin )
--install( FILES doc/manpage/lsyncd.1 DESTINATION man )
-+install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
diff --git a/app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-mandir.patch
similarity index 100%
rename from app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch
rename to app-admin/lsyncd/files/lsyncd-2.2.3-mandir.patch
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
deleted file mode 100644
index 6fcf0da3b934..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
deleted file mode 100644
index 13a978ad2fdb..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
deleted file mode 100644
index 13a978ad2fdb..000000000000
--- a/app-admin/lsyncd/lsyncd-2.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
-inherit cmake-utils
-
-DESCRIPTION="Live Syncing (Mirror) Daemon"
-HOMEPAGE="https://github.com/axkibe/lsyncd"
-SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-lang/lua-5.1:0=[deprecated]"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	net-misc/rsync"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-mandir.patch
-)
-
-S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
index 26b28307c983..2f2808d63a72 100644
--- a/app-admin/lsyncd/lsyncd-2.2.3.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -30,7 +30,7 @@ BDEPEND="${CDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.3-cmake_lua_version.patch
-	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
+	"${FILESDIR}"/${PN}-2.2.3-mandir.patch
 )
 
 S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0baa0a6337ac..9439f03a4693 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
index cb1335ebec71..d1e13dabd9bb 100644
--- a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 3a28e2175b24..99609a6cc783 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/cantera-docs/Manifest b/app-doc/cantera-docs/Manifest
index 3119f746b2d7..349c765dcd28 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -1 +1,2 @@
 DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f08d6053b3383e28660028e72a55b2c231bfcfde976bec5e2be85828e642668d71730bdc803198bdcdee0631c09208ec SHA512 182475b180e65bb8bd7d5259a3b2a385b2b7c7db61a258a460c3e5fa91ae101306702ea3f00c6996a65ae8ebd1985dcc84b6d8291434578938efbb584db94c40
+DIST cantera-docs-2.5.1.tar.xz 4916296 BLAKE2B eb3da9f1258f6ee71d8a886c916b7c53c886078a0cf92bb407b6ddde28da659e9bb9195809a65ffdf20a49cee107e1a6503a381b52cc58a36fe750bd7edc6d72 SHA512 3e7cac6bc5ef8c8721f4fa4aa34ba9a3291a8bb9919801df22d080a4a45158e9388d2e4b19f0b133fbf9e9a1810d3ef53d12aae032caed5bfe593bc3054de939
diff --git a/app-doc/cantera-docs/cantera-docs-2.5.1.ebuild b/app-doc/cantera-docs/cantera-docs-2.5.1.ebuild
new file mode 100644
index 000000000000..4063f8380503
--- /dev/null
+++ b/app-doc/cantera-docs/cantera-docs-2.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Documentation API reference for Cantera package libraries"
+HOMEPAGE="https://cantera.org"
+SRC_URI="https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-${PV}/${P}_modified_menu.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/"
+
+src_install() {
+	insinto /usr/share/cantera/doc/
+	doins -r "${S}/."
+
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/doxygen/html/index.html" "Cantera Doxygen Documentation" "text-html" "Development"
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/sphinx/html/index.html" "Cantera Sphinx Documentation" "text-html" "Development"
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index ab9cb9ef0e74..48f494e3cdb9 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.41.0.ebuild
index 30890b0aef5a..67a45a3dae6a 100644
--- a/app-mobilephone/gammu/gammu-1.41.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.41.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
 
 DEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b6f69fcda32b..bf1edbf2e55a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index 6836dc56307d..f3ac3d72fe96 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/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ebc54d678c68..56013ce96f88 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
similarity index 95%
rename from dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
rename to dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
index c7775a4cf978..f6036b2752f5 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	cmake_src_prepare
 
-	sed -e "s,lib/lib,$(get_libdir)/lib,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
+	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1d1a78d44d3f..ad81d99fbd08 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libofx/libofx-0.10.1.ebuild b/dev-libs/libofx/libofx-0.10.1.ebuild
index ec9e0c164486..cf7e5ddabcc0 100644
--- a/dev-libs/libofx/libofx-0.10.1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2da29259af9a..f2079eec8a6b 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 596ccbf5c60d..5cc7d9fc31c1 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,4 +1,3 @@
-DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
 DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
 DIST aiorpcX-0.19.gh.tar.gz 65557 BLAKE2B 2bc9d809abbcdcf4dd0358e4bb734068ef76482dc711e1c4568db78e9ae2141e00cffb82c1c7d5976887e0561b6c4f1422063969cec23a886bb192c279fc57d7 SHA512 21d8a75a90233bb4caed804da39274516a7c852c8adf9eabcba928ff7ad9bf922760fdca2c040aad8242193cb23be512803615973256b35347b6c998cccd6632
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
deleted file mode 100644
index 7cd487159a20..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py38.patch
-)
-
-src_prepare() {
-	# websockets are optional and not packaged in Gentoo
-	rm tests/test_websocket.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
index 8a97458319e0..7547b1dfcba9 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
deleted file mode 100644
index bc189277c4c6..000000000000
--- a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/aiorpcx/socks.py b/aiorpcx/socks.py
-index 92ad396..4a6cefa 100644
---- a/aiorpcx/socks.py
-+++ b/aiorpcx/socks.py
-@@ -45,7 +45,7 @@ SOCKSUserAuth = collections.namedtuple("SOCKSUserAuth", "username password")
- 
- # Random authentication is useful when used with Tor for stream isolation.
- class SOCKSRandomAuth(SOCKSUserAuth):
--    def __getitem__(self, key):
-+    def __getattribute__(self, key):
-         return secrets.token_hex(32)
- 
- 
-diff --git a/tests/test_curio.py b/tests/test_curio.py
-index 9292f52..97b479b 100644
---- a/tests/test_curio.py
-+++ b/tests/test_curio.py
-@@ -1,4 +1,5 @@
- from asyncio import get_event_loop, InvalidStateError
-+import sys
- import time
- 
- import pytest
-@@ -525,6 +526,8 @@ async def test_nested_context_timeout():
-     ]
- 
- 
-+@pytest.mark.xfail(sys.hexversion > 0x03080000,
-+                   reason='broken on py3.8, upstream ignores the problem')
- @pytest.mark.asyncio
- async def test_nested_context_timeout2():
-     async def coro1():
-@@ -562,6 +565,8 @@ async def test_nested_context_timeout2():
-     await parent()
- 
- 
-+@pytest.mark.xfail(sys.hexversion > 0x03080000,
-+                   reason='broken on py3.8, upstream ignores the problem')
- @pytest.mark.asyncio
- async def test_nested_context_timeout3():
-     async def coro1():
-diff --git a/tests/test_jsonrpc.py b/tests/test_jsonrpc.py
-index 315f639..b0cdd60 100644
---- a/tests/test_jsonrpc.py
-+++ b/tests/test_jsonrpc.py
-@@ -1126,7 +1126,6 @@ def test_handler_invocation():
-         (Request('missing_method', []), 'unknown method'),
-         (Request('add_many', []), 'requires 1'),
-         (Request('add_many', {'first': 1, 'values': []}), 'values'),
--        (Request('powb', {"x": 2, "y": 3}), 'cannot be called'),
-         (Request('echo_2', ['ping', 'pong']), 'at most 1'),
-         (Request('echo_2', {'first': 1, 'second': 8, '3rd': 1}), '3rd'),
-         (Request('kwargs', []), 'requires 1'),
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 65f1fdcdf3f6..822eb9265399 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,4 @@
 DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d37a556ace06585b7d354fa75338e5c4e4263ece0d8d043f29f3909e3c200b2c79c744a4bd13319764667998 SHA512 30ab01c66ef1dfb7fb35dc8609ca19039fa3e37638ff0df681d0ffc9dbc832e9d3a577d9a45fc70ff3e74aacb6198b37e61ada22854572c57c27d7ecbef09caa
 DIST arrow-1.0.0.tar.gz 101951 BLAKE2B b8949dc2274f44020bd70e1013b3b3053789319daae0c630e17d2bac66d614e958b2d34ed9b06a1a5502a21684de10e053d4f1e70bfaf9a630548135d72f364f SHA512 4e487a0c1c6f55361b8ec673082d61efec1b27a32b19e2e599a344407737e5eea47ee8e2173b2f089e69a5638f99022870bb3ac57f31c16d5b4efd2858933fa8
 DIST arrow-1.0.1.tar.gz 102243 BLAKE2B bad601878bf692858db56967b456fa0c413faebcaaeee352ffe40933cfd915dca8dbbcc2ce4e4f37e03b393acdbfc94d49b8825664a9d1e246ae91a350e9cfcd SHA512 5500df4af6ac8c2858dc98a427a4b81d51d08a4bb44841ef03bbb3a57c9c9004a306e5d627a5202d5b7498dfb71c3602c1ec265666958a94b95861c901ecd79a
+DIST arrow-1.0.2.tar.gz 102330 BLAKE2B 2f7b737890aceceb265d2790d163c2d2325e78cc9045a95523b4e71d520f7d1fdb10efd18ccfc305bf10b27cf8f503a4e5bfc81897936b7c63600a3569ddd230 SHA512 a1ddfda75c84bd1e7708ba8368bbf672b1906bcd3a10cfb9ff867c72acd4da977089b4059b16de29c6112ce793e459f9eaa173f345bd25727c2dcbacbe235b05
diff --git a/dev-python/arrow/arrow-1.0.2.ebuild b/dev-python/arrow/arrow-1.0.2.ebuild
new file mode 100644
index 000000000000..81e5cb7ef66e
--- /dev/null
+++ b/dev-python/arrow/arrow-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d05a68c09e8a..7ed6a721d5fa 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1,3 @@
 DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
+DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89edaefdf94209a2fdc7f2686a27abcb1c0710cad658473a0a1516df5ad80f10c6b7c2a4f14dea36af94aa9ae5b SHA512 a0aaa95257961235abbbbc021cdb48da760f8b1856bbc0a7a8b98c53c69045cee4bfe575182a631f994765819e373b33b3a6eca052573128e8b36f2c23c250de
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
diff --git a/dev-python/astroid/astroid-2.5.1.ebuild b/dev-python/astroid/astroid-2.5.1.ebuild
new file mode 100644
index 000000000000..b2a9c306e3f1
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index c34f8832694d..33497c684624 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,4 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.4.tar.gz 687727 BLAKE2B 54c9e605eaed551aff0c6764bf2747e2ce64a7c0596cb78cb4ad6998c4b7d79fe31bfe98eb240aee4c838dde6a4536f8e84d00c14846bb671b51b28168a96947 SHA512 c682806bce603fff1ff09234c72e17370093192053961656f06ef4bcc7928f052ef4a350e80687c640d7608a22f4f3434e1836d83674eebca53459745838f519
+DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
diff --git a/dev-python/coverage/coverage-5.5.ebuild b/dev-python/coverage/coverage-5.5.ebuild
new file mode 100644
index 000000000000..6a99cbf4e39c
--- /dev/null
+++ b/dev-python/coverage/coverage-5.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 5e90dba17e8d..5c7e3d135185 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 281d985f4479..207e93a8704c 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -2,3 +2,4 @@ DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607
 DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
 DIST importlib_resources-5.0.0.tar.gz 30603 BLAKE2B 66a22891e28e282919ed3847e69d36655ab8052f4f6c743ceb43456bc5447348302b61e5e3d3553d006fbab45c706882680265613497eedcc97c732a1776183a SHA512 eff23d8d365f105069910efe6e95f63a7e6c2cea7ca707cf4085c6d9f9c4f28065a1ad937d06ab3549a0ac25da5fa950af7b56a52d892125265252e0b79bf7f9
 DIST importlib_resources-5.1.0.tar.gz 31435 BLAKE2B f3e39117027a07de6c781e8b9bc3809a8fda4d1d5305bd514f4818a89a15e567c7c3c9533b263d8a2874e8fe0a580a55739e784a7ea2c7190a3eba7a422fab2a SHA512 f8ea8719a038a0b14845678c3ad836a6285b69bd3af45a45bb1e8d3ba401c72b8da00907a03297cde466551b169ba3f02133231e6f8d935d39110681ada35c8e
+DIST importlib_resources-5.1.1.tar.gz 32125 BLAKE2B 3205ca16163ab3e186c4d2bb255c3cc39fde632ed28bbeb3c8a30e771445de9f02020e1a78f9705332ba279ed3bd9b4e1cff787ceb14cbaa7bc1f72eaa9298ba SHA512 2ee6f8a5f9c501647cd0b79f91041cefaa0b2822dd093efd8cc2917ef45e1917b7a9b493a62b28393de65fdb008f726912fefe61cf1a1aabaed312193b801033
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.1.ebuild
new file mode 100644
index 000000000000..832a9c131a5d
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_7)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
index 998dd3f8363e..ee455c5dfa5b 100644
--- a/dev-python/js2py/js2py-0.70_p20210218.ebuild
+++ b/dev-python/js2py/js2py-0.70_p20210218.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
index 8c0c61dafd5e..bb2e92b93aa9 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index dc14ebaca8c7..40a7320a869f 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-2.5.2.tar.gz 2368463 BLAKE2B dcf7e2c6f8a2a9d41073f2528fa6a13d5d79c0915d4dba810fb13a989039beafebbbfe0c8211f0a769ade9889af0c99ce1ca5052c74d0d88d817447dfdb3a7d5 SHA512 52e13805d4712f623af6c91eb287009abb6179d28451ab0a32b3472c4b8e484cc5700c3a32bb98cd7a188d4249128b2a2ef7fb19e8bc5aee4488627df161c38d
 DIST pikepdf-2.6.0.tar.gz 2368553 BLAKE2B 9bffcb7ed046f0337392fc27bcdaf8bc7ddd451d6c238fc5cf7ef952658f154e6cd0ae553f84fe10c4df946756fb8011a449e90b7f886db11b2330fe452f75d7 SHA512 0a57df99156dfe34d129231cd9ee703cb4d00f44d65e767aa71d7094e1e0896afda1d8f770f4efa33e156ac083ede9741ac7765a415a101bf38f1eab8da04bf1
 DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437ef41e49ad922a2f29c46f74cba9570aa1e3f9dffeacfe2bf31f6abee27bc393200620ebf23184f80ce3b40a93c3 SHA512 d3291e15461ebf9cb20d6ed145d6327e25595375a0b9e4ca9f6ee26a4b698d094f8f938cf766ee530cdd565b0f10bec78f228f70479e2777907376d24ea3b34f
+DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435
diff --git a/dev-python/pikepdf/pikepdf-2.8.0.ebuild b/dev-python/pikepdf/pikepdf-2.8.0.ebuild
new file mode 100644
index 000000000000..597751526446
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index d10c00986040..8c8afa3f651f 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1 +1,2 @@
 DIST pillow-8.1.0.tar.gz 44929704 BLAKE2B 6b8100f26a746c625851521d7aa3696c4de30b05d2debc07cfcc038c1bc1e73ab1136676d22fccdf17b8d0ecfeb21479168580e5f5a93488c50cbaf1c6533d79 SHA512 1014271d29e98c465e6882ed3f2f915f8955f5ada2a762c671a1f79389b25576ead2d144c6eaf42b4777f14438d15979d78d34dc32d984fd7defb53f0d209957
+DIST pillow-8.1.1.tar.gz 44976395 BLAKE2B 208534f3e24d9416360efaab8f802b4d482208fe81d1b39bf8339ddd1fe992b281a59faaadeb5ad5364ff062b1b7b19c3dadc11f9a453d5bd14bbf5170521396 SHA512 d04300442ac33e946bea186d6293516b615059b0f4b1b6ac7a48ce3a2e4e22bce5bc403331be697c022a4c81cb30f943cc33bfda649873c734af7db23afd6b69
diff --git a/dev-python/pillow/pillow-8.1.1.ebuild b/dev-python/pillow/pillow-8.1.1.ebuild
new file mode 100644
index 000000000000..f78d8294761f
--- /dev/null
+++ b/dev-python/pillow/pillow-8.1.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
index eca5b2ff79d7..70e340f60a4a 100644
--- a/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
+++ b/dev-python/publicsuffix/publicsuffix-2.20191221.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index 6adc167f5559..d0d1cdfd469d 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 34586e8868a0..1bf5b1472dc5 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -2,3 +2,4 @@ DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3
 DIST pylint-2.6.1.tar.gz 694232 BLAKE2B c169939a49a9a8f3225e120cf56df12fabd8d1940504231d0e1c3783dd8b87beb24e7095e15b332189043d5790b69bd2a41b0baf56cffccb4ef5d7cfe2be9cf8 SHA512 6a6bda57ed22df8378aea3de3fe3b97deb7c0742abeb08463d3d2e0f0cbf6bd2166861456b3fa7cd2d7cf148b052fc4913479c3f632b8e92ebf8d26189a122b1
 DIST pylint-2.6.2.tar.gz 680364 BLAKE2B 59bd18d5458f86a7279a7fc895f1564fc575c27e7ad7b4a668456d6005cc2a4d920e2221c2ec3f447c1c63376e1b35f1e1c5177c355f52872d3c556aa63ae462 SHA512 75e88aea23e4e68714451d22b0a6a2106a4821c05cdd7d077e12ea7f6198959ebdace6824b1e2fb42a632051e049a2c84eb93990a7b6af23c7fee7e2f56bf6ec
 DIST pylint-2.7.1.tar.gz 708916 BLAKE2B 606637ff25daccba741ae5bcdecb6a2be50bc17393009193a29312b4a218622d23287a0f0c5a81e79e77cc54dfe529483ad01fa39445103f240addaa3ad58bf7 SHA512 eebf1d3da5ca072cb912ecffebf183c79f2f8b2c2b14044751aad202d75d06d1c06abb561d4581990b92fe54c06b570a1de39b792b0d729cf300c01c82c4e3c0
+DIST pylint-2.7.2.tar.gz 709177 BLAKE2B 5e4daeb19b6b18d570f4d78b01cc5023d5d245840160fdbddb194ab7036118742ffe3075ee27c37bd7a700d11d9006dc9abaaba9cf9596ae1b63941f139da7ac SHA512 800b210fbe5665db390d5c885d103856dc474b4e43d2f752bdcfcea36121132c26eecdcb67620c4a90456823f11a33568de4d37d59eea692dcd1751d931420f7
diff --git a/dev-python/pylint/pylint-2.7.2.ebuild b/dev-python/pylint/pylint-2.7.2.ebuild
new file mode 100644
index 000000000000..e6b283ca3cff
--- /dev/null
+++ b/dev-python/pylint/pylint-2.7.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	<dev-python/astroid-2.6[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# Fails when PYTHONPATH ends with a colon
+		# https://github.com/PyCQA/pylint/issues/3636
+		tests/test_self.py::TestRunTC::test_do_not_import_files_from_local_directory
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	pytest -vv tests ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 9a409c04b655..7c03bb20d133 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1 +1,2 @@
 DIST pytest-httpx-0.10.1.tar.gz 21117 BLAKE2B 372ecc8a132f28bf7016ed466c4f6974f51c3c2ab9decd68fd8e3c7a810030db9f169f5ab28662cfed006297ea200d3a157ba220f2156b44be03fbf49edc5415 SHA512 f306e57408924b653d3ab4dd28f266b066f202b98440b31769940bdab0be98d5c48817e22d68e2dcdf82426e26334242591d0ae630aa71812f81dd7866b81e0f
+DIST pytest-httpx-0.11.0.tar.gz 21178 BLAKE2B c58c303868fd1b1926a58db28eeda3c5d74cd38f68aad3543cb0296f4dcac59d9fb983287b432219f70bd2003c2a0e32d85ed343b1c279d576ef100b129c7f25 SHA512 eb798d31c710ab50d3176c569aba8ae2131a17f415fe87830fc71aa941d638bdbda4296032a07fce98d9a43a57f250cea380f8c409660eb1f13862094b6fcbb6
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild
new file mode 100644
index 000000000000..6b38ce967264
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.17*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/scipy/scipy-1.6.0.ebuild b/dev-python/scipy/scipy-1.6.0.ebuild
index 3ecc159bf316..a1948aba7496 100644
--- a/dev-python/scipy/scipy-1.6.0.ebuild
+++ b/dev-python/scipy/scipy-1.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index bb19e6600ea7..096ee40c39ab 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 795d19669214..0c4c08fc38b0 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/distro-info-data/Manifest b/dev-util/distro-info-data/Manifest
index 48122187027b..2dabf3a26119 100644
--- a/dev-util/distro-info-data/Manifest
+++ b/dev-util/distro-info-data/Manifest
@@ -1,3 +1,3 @@
 DIST distro-info-data_0.29.tar.xz 6004 BLAKE2B 5b59d444fac259634c9ca7349a8b93c7167fe839971d4761bf133ae8adbd866a41c14af79ee2f149259da8b8ee5e193a2b1b09165b6ad29cafea31c968470e4f SHA512 1c06ce8e0fef12a499623a0c48147c9e99352946c9bdc89a810b413179cff0df43bcd87f839dc200277f3ef8498a34077987121093390551bcf2eb1822da9f2f
-DIST distro-info-data_0.32.tar.xz 6216 BLAKE2B 627a4ada570fbf01bfd18386a7dc9c83280667674a5c52c363222167f32dcde725649c9eecf979d58c7eb155458b41a8ac77e4d7eb0c908975886e5e95f75d8c SHA512 3bbf79104c4b20d7ee02a83c4ea7852c65e7c7b2870d1f237df67d985fd2d52ea75292d80c5fc10af7ea69c89145f2e52670663b759f74a159e0f8c51ef545fd
 DIST distro-info-data_0.42.tar.xz 6888 BLAKE2B 3f08700046149e7e1a4f94a06f6c8abb93c94a1c0c72bfced497801b2e8081ac14f39a889322b6f0e25e776b3cda36da9066723ca2963b588b588c20ff23bd6f SHA512 e49c54eaf2451f32124c5df6d2b49183bbdc5b9bdb958605e5e055138e0fa67c5033dfaab46620121e7e3d1cc5cbb807f9fed809a59c31cf3501c1ebc7131c8b
+DIST distro-info-data_0.46.tar.xz 8632 BLAKE2B 2f19c670afd37a02279b420f795dd5aefbe91abcf60509bb6fe95387f49b4977288c7f393f12b7a884aae40edc7cd6ddb94a7cf1fc38e7f38e2226b215289c05 SHA512 942d3580a7e3e05de03cf5921835c805faa69cf3b3ea2704b381b13fa708336a87a79cbbe03f5bc53ded8563d6b08eb439e75c3d938dba35f6f8b2f3094e6e31
diff --git a/dev-util/distro-info-data/distro-info-data-0.32.ebuild b/dev-util/distro-info-data/distro-info-data-0.46.ebuild
similarity index 84%
rename from dev-util/distro-info-data/distro-info-data-0.32.ebuild
rename to dev-util/distro-info-data/distro-info-data-0.46.ebuild
index 81be8e5f7e20..90e35a5ced78 100644
--- a/dev-util/distro-info-data/distro-info-data-0.32.ebuild
+++ b/dev-util/distro-info-data/distro-info-data-0.46.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Information about the Debian distributions' releases (data files)"
 HOMEPAGE="https://debian.org/"
@@ -15,5 +15,3 @@ IUSE=""
 # Package provides only csv data and test script
 # written in python
 RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index e289b24a1b05..1fb0882fe135 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1 +1,2 @@
 DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
+DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
diff --git a/dev-util/distro-info/distro-info-1.0.ebuild b/dev-util/distro-info/distro-info-1.0.ebuild
new file mode 100644
index 000000000000..fb1bd4cbd9e6
--- /dev/null
+++ b/dev-util/distro-info/distro-info-1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_OPTIONAL=true
+
+inherit distutils-r1
+
+DESCRIPTION="Provides information about the Debian distributions' releases"
+HOMEPAGE="https://debian.org"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-lang/perl:=
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	test? (
+		dev-util/shunit2
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/distro-info-data"
+
+src_prepare() {
+	default
+
+	# 1. Gentoo do not provides dpkg vendor information
+	# 2. Strip *FLAGS
+	# 3. Strip predefined CFLAGS
+	# 4. Point to correct perl's vendorlib
+	# 5. Remove python tests - python eclass will be used instead
+	sed -e "/cd python && python/d" \
+		-e "/VENDOR/d" \
+		-e "/dpkg-buildflags/d" \
+		-e "s/-g -O2//g" \
+		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
+		-e "/pyversions/d" \
+		-i "${S}"/Makefile || die
+}
+
+src_configure() {
+	default
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";' || die) \
+		DESTDIR="${D}" install
+
+	if use python; then
+		pushd ./python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	TZ=UTC default
+
+	if use python; then
+		python_test() {
+			esetup.py test
+		}
+
+		pushd ./python > /dev/null || die
+		distutils-r1_src_test
+		popd > /dev/null || die
+	fi
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 59ad13a976af..e08429eadcb2 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 56d407605575..231dce2de6a4 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -414,8 +414,7 @@ kernel-install_pkg_prerm() {
 
 # @FUNCTION: kernel-install_pkg_postrm
 # @DESCRIPTION:
-# No-op at the moment.  Will be used to remove obsolete kernels
-# in the future.
+# Clean up the generated initramfs from the removed kernel directory.
 kernel-install_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -423,7 +422,7 @@ kernel-install_pkg_postrm() {
 		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(dist-kernel_get_image_path)
 		ebegin "Removing initramfs"
-		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" &&
+		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}"/initrd{,.uefi} &&
 			find "${EROOT}/usr/src/linux-${ver}" -depth -type d -empty -delete
 		eend ${?}
 	fi
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c2a8d4155c0d..5ebda7d01870 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..d394535a1003
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2[abi_x86_32(-)]
+	app-arch/xz-utils[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	dev-libs/libxml2:2[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	net-libs/libpcap[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/libudev[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:3[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+FILECAPS=(
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-setcap.patch"
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		# -mxsave flag is needed when GCC >= 8.2 is used
+		# https://bugs.gentoo.org/685156
+		if [[ $(gcc-major-version) -gt 8 || $(gcc-major-version) == 8 && $(gcc-minor-version) -ge 2 ]]; then
+			append-flags -mxsave
+		fi
+	fi
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+	# Build with ld.gold fails
+	# https://github.com/PCSX2/pcsx2/issues/1671
+	tc-ld-disable-gold
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	if use amd64; then
+		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+		# https://github.com/PCSX2/pcsx2/pull/422
+		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+	fi
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DDISABLE_BUILD_DATE=TRUE
+		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DDISABLE_SETCAP=TRUE
+		-DEXTRA_PLUGINS=FALSE
+		-DOPTIMIZATION_FLAG=
+		-DPACKAGE_MODE=TRUE
+		-DXDG_STD=TRUE
+
+		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DDOC_DIR=/usr/share/doc/"${PF}"
+		-DEGL_API=FALSE
+		-DGTK3_API=TRUE
+		-DOPENCL_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=TRUE
+		-DUSE_VTUNE=FALSE
+	)
+
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+	cmake_src_configure
+}
+
+src_install() {
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake_src_install
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 91117108c374..1555b343b49a 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -40,14 +40,11 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/wxGTK:3.0-gtk3[X]
 "
-DEPEND="${RDEPEND}
-	dev-cpp/pngpp
-	dev-cpp/sparsehash
-"
+DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	"CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
 )
 
 pkg_setup() {
@@ -73,7 +70,6 @@ src_configure() {
 		-DDISABLE_BUILD_DATE=TRUE
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
-		-DEXTRA_PLUGINS=FALSE
 		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index fd767ad8126d..e75968721281 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-
-inherit desktop toolchain-funcs multiprocessing wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -37,10 +37,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
 # TODO: Unbundle premake5
 # See bug #773472 which may help (bump for it)
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
+	virtual/rust
 	test? ( dev-lang/perl )
 "
 # Removed dependency on nvtt as we use the bundled one
@@ -70,7 +74,9 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+	"${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
 )
 
 pkg_setup() {
@@ -101,7 +107,7 @@ src_configure() {
 		--datadir="/usr/share/${PN}"
 	)
 
-	tc-export CC CXX
+	tc-export AR CC CXX RANLIB
 
 	# Stock premake5 does not work, use the shipped one
 	# TODO: revisit this, see above BDEPEND note re premake5
@@ -127,8 +133,6 @@ src_configure() {
 }
 
 src_compile() {
-	tc-export AR
-
 	# Build 3rd party fcollada
 	einfo "Building bundled fcollada"
 	emake -C libraries/source/fcollada/src
@@ -209,7 +213,9 @@ src_install() {
 	# Install bundled SpiderMonkey and nvtt
 	# bug #771147 (comment 1)
 	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
+	doexe binaries/system/{libCollada,libmozjs78-ps-release}
+
+	use nvtt && doexe /binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
 	use editor && doexe binaries/system/libAtlasUI.so
 
 	dodoc binaries/system/readme.txt
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
new file mode 100644
index 000000000000..7503ffc001b9
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
@@ -0,0 +1,32 @@
+--- a/libraries/source/fcollada/src/Makefile
++++ b/libraries/source/fcollada/src/Makefile
+@@ -7,6 +7,7 @@
+ 	PIC_FLAGS ?= -fpic
+ endif
+ 
++AR? ?= ar
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+ CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
+@@ -16,6 +17,7 @@
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
++RANLIB ?= ranlib
+ 
+ # FCollada is not aliasing-safe, so disallow dangerous optimisations
+ # (TODO: It'd be nice to fix FCollada, but that looks hard)
+@@ -246,11 +248,11 @@
+ 
+ output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs
+ 	@echo "$@"
+-	@ar -cr $@ $(OBJECTS_DEBUG); ranlib $@
++	@$(AR) -cr $@ $(OBJECTS_DEBUG); $(RANLIB) $@
+ 
+ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs
+ 	@echo "$@"
+-	@ar -cr $@ $(OBJECTS_RELEASE); ranlib $@
++	@$(AR) -cr $@ $(OBJECTS_RELEASE); $(RANLIB) $@
+ 
+ output/FColladaTest: $(OBJECTS_TEST) | output_dirs
+ 	$(CXX) -o $@  $(OBJECTS_TEST) $(LIBS) $(LDFLAGS_TEST)
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
new file mode 100644
index 000000000000..f4436a7b92c4
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/773493
+--- a/libraries/source/spidermonkey/FixRust150.diff
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 46ae1e05c9ff..816a93357bb2 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index f59e4db4af15..9af133744ab3 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 9f82949fddf9..556be207ed98 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,2 +1,3 @@
 DIST clawsker-1.1.0.tar.xz 153404 BLAKE2B 8d19eaa94339b49689bd97921101e8c064f8cd35802a08248ddcebf6e595e1cfd8b577b68dcf1534c054d21dc1ea92d109a2c20ed30b7387aa88c60518576d34 SHA512 e76be7214e5f7568423890cc29e736c163678bb4501911467afd5a4ded2f61a6493c31ac08ca2f55cd143109a37c0f2f27481a0b556628cfaf6d477112375f2b
 DIST clawsker-1.3.1.tar.xz 166580 BLAKE2B 1e0fc3318c150047fff8bdfa371fe4fc7a6bf7da5b16681cb8c0d84947d46a4f9934808bc12ec72aa0143859a6ebb5026a3d7b26cb7b9e7dd2e69b4552c01752 SHA512 d46f55fdd63493c85d47d3081bc2c0d82d76b63b193ffa05ae3130944a68c1ae78013329338f0ac773da6ca45455b3029346f74e2ca7a01129013e931da5ed85
+DIST clawsker-1.3.4.tar.xz 172024 BLAKE2B db44d823f930e9a9d5519e060dc9ab3c7ac8c4d851a7e57e7832c1bb476a5640cc58ee97c390df8d98d0366634a5c10638cd7e2c24528cb7dfc0bfc35b71c0f5 SHA512 467e28ba768e2b18d704bf230157225e5f1f9becfe405f12563e1f65403e9eaa8e06e58d743f3d7712554cdaf59634e51dc1eecb57fbbd9fb23561b86c3cd975
diff --git a/mail-client/clawsker/clawsker-1.3.4.ebuild b/mail-client/clawsker/clawsker-1.3.4.ebuild
new file mode 100644
index 000000000000..53c852295b3e
--- /dev/null
+++ b/mail-client/clawsker/clawsker-1.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="https://www.claws-mail.org/clawsker.php"
+SRC_URI="https://www.claws-mail.org/tools/${P}.tar.xz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Gtk3
+	dev-perl/Locale-gettext
+	>=dev-perl/File-Which-1.210
+	mail-client/claws-mail
+"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 292e1e5120e2..570080e4f9b5 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild
index 02ec9880cf6b..3e81c042cda4 100644
--- a/media-gfx/gif2png/gif2png-2.5.14.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=media-libs/libpng-1.2:0=
 	sys-libs/zlib:="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ad64e1a7060e..7a541817df52 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
index 4e796e2186d3..daef825f99e2 100644
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/openimageio/openimageio-2.2.11.1.ebuild b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
index f963cbd15ac0..1fd923d5c9b5 100644
--- a/media-libs/openimageio/openimageio-2.2.11.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 8e16650dc015..48c2345db880 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
deleted file mode 100644
index ae6c6dc517e9..000000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-https://projects.vdr-developer.org/issues/2581
-Manpages with encoding will not created correct
-
-Reviewed-by: Martin Dummer <martin.dummer@gmx.net> (2020 Jan 03)
---- a/doc-src/de/epgsearch.1.txt
-+++ b/doc-src/de/epgsearch.1.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearch> - Suchtimer und Ersatz für VDR's Standard-Programm-Menü
---- a/doc-src/de/epgsearch.conf.5.txt
-+++ b/doc-src/de/epgsearch.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearch.conf> - Die gespeicherten Suchtimer
---- a/doc-src/de/epgsearchblacklists.conf.5.txt
-+++ b/doc-src/de/epgsearchblacklists.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchblacklists.conf> - Die gespeicherten Auschlusslisten-Suchtimer
---- a/doc-src/de/epgsearchcats.conf.5.txt
-+++ b/doc-src/de/epgsearchcats.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchcats.conf> - Die Kategorien des erweiterten EPGs, sofern vorhanden.
---- a/doc-src/de/epgsearchchangrps.conf.5.txt
-+++ b/doc-src/de/epgsearchchangrps.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchchangrps.conf> - Liste der Kanalgruppen
---- a/doc-src/de/epgsearchcmds.conf.5.txt
-+++ b/doc-src/de/epgsearchcmds.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchcmds.conf> - EPG-Befehle
---- a/doc-src/de/epgsearchdirs.conf.5.txt
-+++ b/doc-src/de/epgsearchdirs.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchdirs.conf> - Liste von Aufnahmepfaden zur einfachen Auswahl
---- a/doc-src/de/epgsearchmenu.conf.5.txt
-+++ b/doc-src/de/epgsearchmenu.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchmenu.conf> - Konfiguration der Menüdarstellung
---- a/doc-src/de/epgsearchswitchtimers.conf.5.txt
-+++ b/doc-src/de/epgsearchswitchtimers.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchswitchtimer.conf> - Die gespeicherten Umschalttimer
---- a/doc-src/de/epgsearchtemplates.conf.5.txt
-+++ b/doc-src/de/epgsearchtemplates.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchtemplates.conf> - Die gespeicherten Suchtimer-Vorlagen
---- a/doc-src/de/epgsearchuservars.conf.5.txt
-+++ b/doc-src/de/epgsearchuservars.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchuservars.conf> - Die Uservariablen
---- a/doc-src/de/noannounce.conf.5.txt
-+++ b/doc-src/de/noannounce.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<noannounce.conf> - Liste von Sendungen, die nicht mehr per OSD angekündigt
---- a/doc-src/de/timersdone.conf.5.txt
-+++ b/doc-src/de/timersdone.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<timersdone.conf> - Liste von anstehenden Timern, die von Suchtimern erzeugt
---- a/doc-src/en/epgsearch.conf.5.txt
-+++ b/doc-src/en/epgsearch.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearch.conf> - The searchtimers
---- a/doc-src/en/epgsearchcats.conf.5.txt
-+++ b/doc-src/en/epgsearchcats.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
- 
- F<epgsearchcats.conf> - Configuration of the additional EPG information
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0e78b1316f17..4c0095606ac0 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
index 5cf9c05d1266..65dfcefe7f5d 100644
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index adcbf64c8535..f2acbf2ddeb8 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 940714d121cd..da722d673cd6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Mar 2021 06:38:29 +0000
+Mon, 01 Mar 2021 12:38:30 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ab78afd21b7c..da722d673cd6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Mar 2021 06:38:30 +0000
+Mon, 01 Mar 2021 12:38:30 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index de65134e1f25..1baf25758d5a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3b7bf0a12005..57bf8c9277ba 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.0 b/metadata/md5-cache/app-admin/lsyncd-2.2.0
deleted file mode 100644
index 20c4350f409e..000000000000
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0=[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0=[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.0.tar.gz -> lsyncd-2.2.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e1ec7a57f497bd8eedd1d128422f6c3
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.1 b/metadata/md5-cache/app-admin/lsyncd-2.2.1
deleted file mode 100644
index 48d8d608979f..000000000000
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0=[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0=[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.1.tar.gz -> lsyncd-2.2.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc60e8e0c59778727fa82c9c538c6573
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.2 b/metadata/md5-cache/app-admin/lsyncd-2.2.2
deleted file mode 100644
index f2febe2dd0bd..000000000000
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0=[deprecated] app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Live Syncing (Mirror) Daemon
-EAPI=6
-HOMEPAGE=https://github.com/axkibe/lsyncd
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0=[deprecated] net-misc/rsync
-SLOT=0
-SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.2.tar.gz -> lsyncd-2.2.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc60e8e0c59778727fa82c9c538c6573
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.3 b/metadata/md5-cache/app-admin/lsyncd-2.2.3
index 5653681bb7da..7918f05c3f3f 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.3
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.3.tar.gz -> lsyncd-2.2.3.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	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-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5765b25249885c6e45efabc3a5fa3593
+_md5_=7e11327bbf274c968d10f1aa9bdc5581
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 5b8dfbaf52ff..67731f7997ef 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1 b/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
index 5be8423bf5b5..e02b0a3e846f 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=7
 HOMEPAGE=https://gnupg.org/aegypten2
 IUSE=caps efl emacs gnome-keyring gtk ncurses qt5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-pinentry-0.7.2 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) efl? ( dev-libs/efl[X] ) gnome-keyring? ( app-crypt/libsecret ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) gtk? ( app-crypt/gcr )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ab720c639cb8662c5efad85a8e2b6b2
+_md5_=02e59364b9484ea6982122d1a621425d
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index e60dc8335e4f..0c98bcb00ec2 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/cantera-docs-2.5.1 b/metadata/md5-cache/app-doc/cantera-docs-2.5.1
new file mode 100644
index 000000000000..e1e8d5860867
--- /dev/null
+++ b/metadata/md5-cache/app-doc/cantera-docs-2.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation API reference for Cantera package libraries
+EAPI=7
+HOMEPAGE=https://cantera.org
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-2.5.1/cantera-docs-2.5.1_modified_menu.tar.xz -> cantera-docs-2.5.1.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5d750a9efb3666fad3e1d2ed2e62927
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 9697267f5461..4a16cc4d8b5a 100644
Binary files a/metadata/md5-cache/app-mobilephone/Manifest.gz and b/metadata/md5-cache/app-mobilephone/Manifest.gz differ
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.41.0 b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
index 9a670722d017..dd85500852d6 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.41.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
@@ -5,10 +5,10 @@ DESCRIPTION=A tool to handle your cellular phone
 EAPI=7
 HOMEPAGE=https://wammu.eu/gammu/
 IUSE=bluetooth curl dbi debug irda mysql nls odbc postgres usb
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= dev-libs/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.41.0.tar.bz2
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	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_=e5a7ade54a65d252513eeca05e1abada
+_md5_=143c2502e76f0198b90a1a7b59ead899
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3b63eac19187..054e25284061 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/qpdf-10.1.0 b/metadata/md5-cache/app-text/qpdf-10.1.0
index 37c7cd961359..85e07a7f78ec 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_=ebaee825c57613e660b1bfca6bea61f5
+_md5_=2c1d13c5082408d47fdf66b0472ae3ac
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 45e816b05f0e..f7864395e79c 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r1 b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r2
similarity index 97%
rename from metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r1
rename to metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r2
index 1870288b32aa..a984263a3137 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r1
+++ b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.11-r2
@@ -11,4 +11,4 @@ RDEPEND==dev-db/mariadb-connector-c-3.1*[ssl?] dev-db/unixODBC
 SLOT=0/3.1
 SRC_URI=https://downloads.mariadb.org/interstitial/connector-odbc-3.1.11/mariadb-connector-odbc-3.1.11-ga-src.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf8b377de4b1582b90232b909d3d1e1e
+_md5_=1ba090090f3af32b35840ef3f7e5e20a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index cb502b524cbc..861209b4b421 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/libofx-0.10.1 b/metadata/md5-cache/dev-libs/libofx-0.10.1
index 0016d396874b..02964f914e31 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.10.1
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.1
@@ -5,11 +5,11 @@ DESCRIPTION=Library to support the Open Financial eXchange XML format
 EAPI=7
 HOMEPAGE=https://github.com/libofx/libofx
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>app-text/opensp-1.5 >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/libofx/libofx/archive/0.10.1.tar.gz -> libofx-0.10.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4685ecb2173987ab55c310c27e4c80b0
+_md5_=125c2b41e21b58293dcecc278105990a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 75c67bbc0766..d2ff2f2e25a6 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/aiorpcX-0.18.4-r1 b/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
deleted file mode 100644
index d41bd094e2a0..000000000000
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/uvloop[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Generic async RPC implementation, including JSON-RPC
-EAPI=7
-HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
-IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.18.4.tar.gz -> aiorpcX-0.18.4.gh.tar.gz
-_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d800581a352b7b7a3bbc0c6b225d0f7d
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.5 b/metadata/md5-cache/dev-python/aiorpcX-0.18.5
index 15d700343f19..e88cbe556938 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.5
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.18.5
@@ -4,7 +4,7 @@ DESCRIPTION=Generic async RPC implementation, including JSON-RPC
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.18.5.tar.gz -> aiorpcX-0.18.5.gh.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=20a95ac4139483df61ce20c7b867e393
+_md5_=7dffa0a6ae0c7c6a0f8074d8b77d331c
diff --git a/metadata/md5-cache/dev-python/arrow-1.0.2 b/metadata/md5-cache/dev-python/arrow-1.0.2
new file mode 100644
index 000000000000..6836f5f72b63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/arrow-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[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/pytz[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(-)] ) test? ( >=dev-python/python-dateutil-2.7.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-python/typing-extensions[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=Better dates and times for Python
+EAPI=7
+HOMEPAGE=https://github.com/arrow-py/arrow/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/python-dateutil-2.7.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-python/typing-extensions[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/a/arrow/arrow-1.0.2.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ff37ad58e9a9b8db7fb7364277865143
diff --git a/metadata/md5-cache/dev-python/astroid-2.5.1 b/metadata/md5-cache/dev-python/astroid-2.5.1
new file mode 100644
index 000000000000..c74ee8a1011d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.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/typed-ast-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/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
+DEPEND=dev-python/setuptools[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/lazy-object-proxy-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.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/typed-ast-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[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[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/python-dateutil[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(-)] )
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
+IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.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/typed-ast-1.4.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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/astroid/astroid-2.5.1.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7c5585a739c9feebb86fdef34401cb66
diff --git a/metadata/md5-cache/dev-python/coverage-5.5 b/metadata/md5-cache/dev-python/coverage-5.5
new file mode 100644
index 000000000000..8cc08e230439
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-5.5
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_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(-)] >=dev-python/setuptools-42.0.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=7
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_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(-)] >=dev-python/setuptools-42.0.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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/c/coverage/coverage-5.5.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d963725344fa1c49bb49551831fccc75
diff --git a/metadata/md5-cache/dev-python/h11-0.12.0 b/metadata/md5-cache/dev-python/h11-0.12.0
index 29e488f85f05..fbcf41420a37 100644
--- a/metadata/md5-cache/dev-python/h11-0.12.0
+++ b/metadata/md5-cache/dev-python/h11-0.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python implementation of HTTP/1.1 inspired by hyper-h2
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/h11/ https://pypi.org/project/h11/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.12.0.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=079d2399a002f9878548084bd3d09c3c
+_md5_=9610c3b7d5e9412cddb848d98352e0df
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.1.1 b/metadata/md5-cache/dev-python/importlib_resources-5.1.1
new file mode 100644
index 000000000000..147a2fe02dda
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/zipp[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.1.1.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=159b8ff6d853998423a4b7d38fbca820
diff --git a/metadata/md5-cache/dev-python/js2py-0.70_p20210218 b/metadata/md5-cache/dev-python/js2py-0.70_p20210218
index 2912045f5a97..4e66446394d2 100644
--- a/metadata/md5-cache/dev-python/js2py-0.70_p20210218
+++ b/metadata/md5-cache/dev-python/js2py-0.70_p20210218
@@ -4,11 +4,11 @@ DESCRIPTION=JavaScript to Python Translator & JavaScript interpreter in Python
 EAPI=7
 HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyjsparser-2.5.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/tzlocal-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.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(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/ea16b519a0f72e17416859a57890b8388fce6e39.tar.gz -> Js2Py-0.70_p20210218.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=123cdd4e09febca04da59bd7d7c433a0
+_md5_=80e167350a96ed8e7cecc6d6dc40255b
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.9 b/metadata/md5-cache/dev-python/kaitaistruct-0.9
index 01a05f5db107..c53a86f26756 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.9
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Kaitai Struct runtime for Python
 EAPI=7
 HOMEPAGE=https://kaitai.io/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~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 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.9.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=30c854eb70a9f52b0b365e43371ab8ee
+_md5_=f2609997570a2bdbba966111d35d8b1b
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.8.0 b/metadata/md5-cache/dev-python/pikepdf-2.8.0
new file mode 100644
index 000000000000..e711648af49e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.8.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools_scm-4.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/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(-)] dev-python/setuptools_scm_git_archive[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/attrs-20.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pillow-5.0.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(-),jpeg,lcms,tiff] >=dev-python/psutil-5[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-6[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-timeout-1.4.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/python-dateutil-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-xmp-toolkit-2.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(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[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/pybind11[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
+DEPEND=app-text/qpdf:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[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/pybind11[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v2.8.0.tar.gz -> pikepdf-2.8.0.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5b77200e9f02c248b0c8212dc141fb9d
diff --git a/metadata/md5-cache/dev-python/pillow-8.1.1 b/metadata/md5-cache/dev-python/pillow-8.1.1
new file mode 100644
index 000000000000..941f71d53906
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-8.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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(-)] dev-python/pytest[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(-)] media-gfx/imagemagick[png] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_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(-)] >=dev-python/setuptools-42.0.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(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=7
+HOMEPAGE=https://python-pillow.org/
+IUSE=examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_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=test? ( jpeg tiff ) || ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-pillow/Pillow/archive/8.1.1.tar.gz -> pillow-8.1.1.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=841407c261ea505141b368e60c446b76
diff --git a/metadata/md5-cache/dev-python/publicsuffix-2.20191221 b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
index 3795d57f7a10..f960079a5537 100644
--- a/metadata/md5-cache/dev-python/publicsuffix-2.20191221
+++ b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
@@ -5,11 +5,11 @@ DESCRIPTION=Get a public suffix for a domain name using the Public Suffix List.
 EAPI=7
 HOMEPAGE=https://github.com/nexB/python-publicsuffix2
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.7.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(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/publicsuffix2/publicsuffix2-2.20191221.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75bedfbc20ea5fa63eee7f9d0de92256
+_md5_=c54e13f0b6e4cb71a878b9c894667afb
diff --git a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421 b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
index e16a52d4892b..e93996bc8826 100644
--- a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
+++ b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
@@ -4,7 +4,7 @@ DESCRIPTION=Fast javascript parser based on esprima.js
 EAPI=7
 HOMEPAGE=https://github.com/PiotrDabkowski/pyjsparser/ https://pypi.org/project/pyjsparser/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/pyjsparser/archive/5465d037b30e334cb0997f2315ec1e451b8ad4c1.tar.gz -> pyjsparser-2.7.1_p20190421.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ded01df13eebfe6b1b4ddbbcd217efa0
+_md5_=22e8e5bed5f07e8d866227b8640a72f7
diff --git a/metadata/md5-cache/dev-python/pylint-2.7.2 b/metadata/md5-cache/dev-python/pylint-2.7.2
new file mode 100644
index 000000000000..0ef50116f81d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.6[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/astroid-2.5.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/isort-4.2.5[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/isort-6[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/mccabe-0.6[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/mccabe-0.7[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-0.7.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/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[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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 code static checker
+EAPI=7
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
+IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.6[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/astroid-2.5.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/isort-4.2.5[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/isort-6[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/mccabe-0.6[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/mccabe-0.7[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-0.7.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(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pylint/pylint-2.7.2.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1eac500fce67cf036e62973affad98c6
diff --git a/metadata/md5-cache/dev-python/pytest-httpx-0.11.0 b/metadata/md5-cache/dev-python/pytest-httpx-0.11.0
new file mode 100644
index 000000000000..d8f5c4367340
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-httpx-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[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/httpx-0.17*[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-6*[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=Send responses to HTTPX using pytest
+EAPI=7
+HOMEPAGE=https://colin-b.github.io/pytest_httpx/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==dev-python/httpx-0.17*[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-6*[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Colin-b/pytest_httpx/archive/v0.11.0.tar.gz -> pytest-httpx-0.11.0.tar.gz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a022ace3c54554e3a569372bd077bcc
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.0 b/metadata/md5-cache/dev-python/scipy-1.6.0
index fa4012097c8e..5376c460f98f 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.0
+++ b/metadata/md5-cache/dev-python/scipy-1.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=7
 HOMEPAGE=https://www.scipy.org/
 IUSE=doc sparse test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.16.5[lapack,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(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/fortran python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.0/scipy-html-1.6.0.zip -> scipy-1.6.0-html.zip https://docs.scipy.org/doc/scipy-1.6.0/scipy-ref-1.6.0.pdf -> scipy-1.6.0-ref.pdf )
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=427eeb99c1327fa309153b997b6265da
+_md5_=60a5c1ef1c4667dc97eb80d19460e3d2
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index 3c29b1b869cc..ee791147b630 100644
--- a/metadata/md5-cache/dev-python/wsproto-1.0.0
+++ b/metadata/md5-cache/dev-python/wsproto-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=WebSockets state-machine based protocol implementation
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/wsproto/ https://pypi.org/project/wsproto/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/h11-0.9[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(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-1.0.0.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=694861f46333ba32d752b33e20cc551d
+_md5_=7ed6a5d31a58d348081d16c10453e860
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0bf34d1ac017..8e593e4a1359 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/distro-info-1.0 b/metadata/md5-cache/dev-util/distro-info-1.0
new file mode 100644
index 000000000000..b722310652e9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/distro-info-1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:= python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python? ( dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-util/shunit2 dev-python/pylint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Provides information about the Debian distributions' releases
+EAPI=7
+HOMEPAGE=https://debian.org
+IUSE=python test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/perl:= python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-util/distro-info-data
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_1.0.tar.xz
+_eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2151ab0c77661bebb9e7138784c534c9
diff --git a/metadata/md5-cache/dev-util/distro-info-data-0.32 b/metadata/md5-cache/dev-util/distro-info-data-0.46
similarity index 79%
rename from metadata/md5-cache/dev-util/distro-info-data-0.32
rename to metadata/md5-cache/dev-util/distro-info-data-0.46
index 44d8139cb667..20c689d42617 100644
--- a/metadata/md5-cache/dev-util/distro-info-data-0.32
+++ b/metadata/md5-cache/dev-util/distro-info-data-0.46
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=Information about the Debian distributions' releases (data files)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://debian.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://debian/pool/main/d/distro-info-data/distro-info-data_0.32.tar.xz
-_md5_=99f2cc7c524f3b117d0645051f1f9c66
+SRC_URI=mirror://debian/pool/main/d/distro-info-data/distro-info-data_0.46.tar.xz
+_md5_=36071991d53bf45c8f3b6773b59c8469
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 50f3880023eb..5df589dcc66a 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2 b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2
new file mode 100644
index 000000000000..fbe0797cef52
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+DESCRIPTION=A PlayStation 2 emulator
+EAPI=7
+HOMEPAGE=https://pcsx2.net/
+IUSE=+filecaps
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X] filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.6.0.tar.gz -> pcsx2-1.6.0.tar.gz
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f57fd6432be28424c9cc3682a6556fea
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index b364ded7086a..2e32241b8f69 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,6 +1,6 @@
 BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-cpp/yaml-cpp:= dev-libs/libaio dev-libs/libfmt:= dev-libs/libxml2:2 media-libs/alsa-lib media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch media-libs/portaudio net-libs/libpcap sys-libs/zlib virtual/libudev virtual/opengl x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/wxGTK:3.0-gtk3[X] dev-cpp/pngpp dev-cpp/sparsehash
+DEPEND=app-arch/bzip2 app-arch/xz-utils dev-cpp/yaml-cpp:= dev-libs/libaio dev-libs/libfmt:= dev-libs/libxml2:2 media-libs/alsa-lib media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch media-libs/portaudio net-libs/libpcap sys-libs/zlib virtual/libudev virtual/opengl x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/wxGTK:3.0-gtk3[X]
 DESCRIPTION=A PlayStation 2 emulator
 EAPI=7
 HOMEPAGE=https://pcsx2.net/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-cpp/yaml-cpp:= dev-libs/libaio dev-
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2555d343bb0a7d86bd756945d801c017
+_md5_=b21a6882637ead1bbd3562cca93631da
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha
index afd4fb7447e9..b923f8d1f7a6 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lang/perl )
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig virtual/rust test? ( dev-lang/perl )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium dev-libs/libxml2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free, real-time strategy game
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium de
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-build.tar.xz https://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-data.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34af99db5b1af00fc8600746c39fd65b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	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	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1b49d60087dc7e78c2f8e4ca11a47aa
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index d6e9448ad977..ce93752a8dd3 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 62890083b427..018294d4fb54 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/clawsker-1.3.4 b/metadata/md5-cache/mail-client/clawsker-1.3.4
new file mode 100644
index 000000000000..20325460cd26
--- /dev/null
+++ b/metadata/md5-cache/mail-client/clawsker-1.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Applet to edit Claws Mail's hidden preferences
+EAPI=7
+HOMEPAGE=https://www.claws-mail.org/clawsker.php
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Gtk3 dev-perl/Locale-gettext >=dev-perl/File-Which-1.210 mail-client/claws-mail
+SLOT=0
+SRC_URI=https://www.claws-mail.org/tools/clawsker-1.3.4.tar.xz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4300e86c7282b7ea07ee08be5044853f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1857c5116d42..543dea584211 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/gif2png-2.5.14 b/metadata/md5-cache/media-gfx/gif2png-2.5.14
index 346e31198fba..493cb1416662 100644
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.14
+++ b/metadata/md5-cache/media-gfx/gif2png-2.5.14
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
 DESCRIPTION=Converts images from gif format to png format
 EAPI=7
 HOMEPAGE=http://catb.org/~esr/gif2png/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0
 SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.14.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=71e93f1db3e5afb284f6361da152d54f
+_md5_=25dde0474cad19889fdc979b6f71cd23
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index caa8c96577c4..cf768e6073d4 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/gmmlib-20.4.1 b/metadata/md5-cache/media-libs/gmmlib-20.4.1
index 5a68cffa995b..4dd9088917b2 100644
--- a/metadata/md5-cache/media-libs/gmmlib-20.4.1
+++ b/metadata/md5-cache/media-libs/gmmlib-20.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Intel Graphics Memory Management Library
 EAPI=7
 HOMEPAGE=https://github.com/intel/gmmlib
 IUSE=test +custom-cflags 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
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-20.4.1.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=029956512524a00b96e37a0d276c2295
+_md5_=9d9b04632d6eb58cce4359815a89c47a
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.11.1 b/metadata/md5-cache/media-libs/openimageio-2.2.11.1
index 35fd5739f8dc..223660118a86 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.2.11.1
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=A library for reading and writing images
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
 IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) 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] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/2.2
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.11.1.tar.gz -> openimageio-2.2.11.1.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2417ccecd851768a562065531581984
+_md5_=68e9dfa87658e7f1ca8a4f667e0d608f
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index bcee694bb4a6..56a7675f347b 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/wavpack-5.4.0 b/metadata/md5-cache/media-sound/wavpack-5.4.0
index 04b8ad9ef06f..8fec1054cc45 100644
--- a/metadata/md5-cache/media-sound/wavpack-5.4.0
+++ b/metadata/md5-cache/media-sound/wavpack-5.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Hybrid lossless audio compression tools
 EAPI=7
 HOMEPAGE=https://www.wavpack.com/
 IUSE=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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/libiconv-0-r1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbry/WavPack/releases/download/5.4.0/wavpack-5.4.0.tar.xz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=968909e9d46abedb1744ce528b9648eb
+_md5_=4d239a41575a4938f9e9ded89c50b245
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f7985be5f03d..d0832bde407d 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.16 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.16
index 351133f3e953..e7cbe4374bf1 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.16
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.16
@@ -5,10 +5,10 @@ DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=7
 HOMEPAGE=https://cacti.net/spine_info.php
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.16.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1dade4adc19c8f12f89a9f71729741be
+_md5_=ef65b89615aee221b2849a19ae0f82bc
diff --git a/metadata/md5-cache/net-analyzer/slurm-0.4.3 b/metadata/md5-cache/net-analyzer/slurm-0.4.3
index 0e9fba7daf32..c502b48991c5 100644
--- a/metadata/md5-cache/net-analyzer/slurm-0.4.3
+++ b/metadata/md5-cache/net-analyzer/slurm-0.4.3
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Realtime network interface monitor based on FreeBSD's pppstatus
 EAPI=7
 HOMEPAGE=https://github.com/mattthias/slurm
-KEYWORDS=~amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/mattthias/slurm/archive/upstream/slurm.tar.gz -> slurm-0.4.3.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	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_=f568ba2f3fe330f130157b6c3ae6abb8
+_md5_=f148d9246456f6cb471a3808940f3c1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1 b/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
deleted file mode 100644
index 404ece6753dd..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0/4.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.27.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b56df6207ee3b10a0b78120b934be9b1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.7 b/metadata/md5-cache/net-analyzer/zabbix-5.0.7
deleted file mode 100644
index 73637b00775a..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0/5.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=906f817c471bdc6d1f022a32daca3e40
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.3 b/metadata/md5-cache/net-analyzer/zabbix-5.2.3
deleted file mode 100644
index a13c14b5f63f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=7
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0/5.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	1d03df021d958f89f4cc78e289d0b116	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=906f817c471bdc6d1f022a32daca3e40
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 1b68921cc24d..3b8dbbe9626b 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/prosody-0.11.8 b/metadata/md5-cache/net-im/prosody-0.11.8
index b936b681f207..8bd4226ba751 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.8
+++ b/metadata/md5-cache/net-im/prosody-0.11.8
@@ -5,7 +5,7 @@ DESCRIPTION=Prosody is a modern XMPP communication server
 EAPI=7
 HOMEPAGE=https://prosody.im/
 IUSE=icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaexpat[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luafilesystem[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasocket[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaevent[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[mysql,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[postgres,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[sqlite,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasec[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-zlib[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) selinux? ( sec-policy/selinux-jabber ) virtual/tmpfiles
 REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.8.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=960fbad34dce25ea9d5bb9a729bad982
+_md5_=688f9fda26990c2c555e8740419d7cec
diff --git a/metadata/md5-cache/net-im/zoom-5.5.6981.0202 b/metadata/md5-cache/net-im/zoom-5.5.6981.0202
deleted file mode 100644
index 57968c611498..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.5.6981.0202
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=7
-HOMEPAGE=https://zoom.us/
-IUSE=bundled-libjpeg-turbo +bundled-qt pulseaudio wayland
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip media-libs/fontconfig media-libs/freetype media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 wayland? ( dev-qt/qtwayland ) )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://zoom.us/client/5.5.6981.0202/zoom_x86_64.tar.xz -> zoom-5.5.6981.0202_x86_64.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df875861c17eb6505b4f7b45576edc41
diff --git a/metadata/md5-cache/net-im/zoom-5.5.7938.0228 b/metadata/md5-cache/net-im/zoom-5.5.7938.0228
new file mode 100644
index 000000000000..e013a45f16f8
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.5.7938.0228
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=7
+HOMEPAGE=https://zoom.us/
+IUSE=bundled-libjpeg-turbo +bundled-qt pulseaudio wayland
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/quazip:0= media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 wayland? ( dev-qt/qtwayland ) )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://zoom.us/client/5.5.7938.0228/zoom_x86_64.tar.xz -> zoom-5.5.7938.0228_x86_64.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c917b1b8f25ea7d4222ae429073023c
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 9493d4ba21c9..a5349793b490 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/mitmproxy-6.0.2 b/metadata/md5-cache/net-proxy/mitmproxy-6.0.2
index 8eaa3350501c..de5a1cbbb143 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-6.0.2
+++ b/metadata/md5-cache/net-proxy/mitmproxy-6.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
 EAPI=7
 HOMEPAGE=https://mitmproxy.org/
 IUSE=libressl test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/asgiref-3.2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hyperframe-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ldap3-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/passlib-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/protobuf-python-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ruamel-yaml-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urwid-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wsproto-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zstandard-0.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !libressl? ( dev-libs/openssl:0 ) libressl? ( >=dev-libs/libressl-3.2.0:0 ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v6.0.2.tar.gz -> mitmproxy-6.0.2.tar.gz
 _eclasses_=distutils-r1	c166cdc9bfdc0fee3ea2100e01fdcdd3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4c65b35c1895b82c0f44e44166a3464f	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=028022b52e52b72748a27349bad0a6fc
+_md5_=2bbdce71609dca53434458f1053e0b6f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 98031f410c64..49e25168b0e8 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/cantera-2.5.0 b/metadata/md5-cache/sci-libs/cantera-2.5.0
deleted file mode 100644
index a7c191267acc..000000000000
--- a/metadata/md5-cache/sci-libs/cantera-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-util/scons[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) 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] )
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_9(-)] ) ) dev-cpp/yaml-cpp <sci-libs/sundials-5.3.0:0= dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 python? ( python_single_target_python3_7? ( dev-python/h5py[python_targets_python3_7(-)] dev-python/pandas[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/h5py[python_targets_python3_8(-)] dev-python/pandas[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/h5py[python_targets_python3_9(-)] dev-python/pandas[python_targets_python3_9(-)] ) ) ) fortran? ( virtual/fortran )
-DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
-EAPI=7
-HOMEPAGE=https://www.cantera.org
-IUSE=+cti fortran pch +python test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_9(-)] ) ) dev-cpp/yaml-cpp <sci-libs/sundials-5.3.0:0= fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Cantera/cantera/archive/v2.5.0.tar.gz -> cantera-2.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	fortran-2	b4796813ccda91c9c0d3463fc90aa969	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	69861348186337fa4b269de5826004b3	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8fd2772f9e534fdc03859bacc1138b7
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4 b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
index 534fd468ce2e..c9a8897acba7 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
+++ b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen qt5? ( dev-qt/linguist-tools:5 ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DEPEND=app-eselect/eselect-opencascade dev-cpp/eigen dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu ffmpeg? ( media-video/ffmpeg ) freeimage? ( media-libs/freeimage ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) tbb? ( dev-cpp/tbb ) vtk? ( >=sci-libs/vtk-8.1.0[rendering] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-eselect/eselect-opencascade dev-cpp/eigen dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu ffmpeg? ( media-video/ffmpeg ) freeimage? ( media-libs/freeimage ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) tbb? ( dev-cpp/tbb ) vtk? ( >=sci-libs/vtk-8.1.0[rendering] <sci-libs/vtk-9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
 EAPI=7
 HOMEPAGE=https://www.opencascade.com
 IUSE=debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=app-eselect/eselect-opencascade dev-cpp/eigen dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu ffmpeg? ( media-video/ffmpeg ) freeimage? ( media-libs/freeimage ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) tbb? ( dev-cpp/tbb ) vtk? ( >=sci-libs/vtk-8.1.0[rendering] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-eselect/eselect-opencascade dev-cpp/eigen dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu ffmpeg? ( media-video/ffmpeg ) freeimage? ( media-libs/freeimage ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) tbb? ( dev-cpp/tbb ) vtk? ( >=sci-libs/vtk-8.1.0[rendering] <sci-libs/vtk-9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=inspector? ( qt5 ) ?? ( optimize tbb )
 RESTRICT=test
 SLOT=7.4.0
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_4_0;sf=tgz -> opencascade-7.4.0.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22b77591e0fede27fb421c064f016c35
+_md5_=59f9a3702a2d3d65644fba2ce9eea271
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c57473ff020b..6cd2b8205a01 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/systemd-tmpfiles-246 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
index 7442f20d3b55..ff99904e43cb 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
 DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246.tar.gz -> systemd-246.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-246-musl.tar.xz )
 _eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f15c752c924a4533a25069ee8bfc5214
+_md5_=d200fc26db83a54783e28f76b5f15bf5
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c96b6662f184..4d85fe73f929 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.99.9 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.9
new file mode 100644
index 000000000000..b9e2a4a6d429
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.99.9
@@ -0,0 +1,14 @@
+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=compile configure install prepare test
+DEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
+DESCRIPTION=Similar to dd but can copy from source with errors
+EAPI=7
+HOMEPAGE=http://www.garloff.de/kurt/linux/ddrescue/
+IUSE=cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
+SLOT=0
+SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.9.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=539ea0b8240d6a8a067a0cf620888d3e
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.7 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.7
index 15c6ec9e1faf..6dd4becb54d3 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.7
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.7
@@ -5,10 +5,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=cron fuse nls static-libs elibc_FreeBSD split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.45.7 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.7/e2fsprogs-1.45.7.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18f286a2ca8c682a837a9b07b1990799
+_md5_=d07c31d21e56a1db574de11c1f8ce2e2
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.0 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.2
similarity index 84%
rename from metadata/md5-cache/sys-fs/e2fsprogs-1.46.0
rename to metadata/md5-cache/sys-fs/e2fsprogs-1.46.2
index b3eb37e6b43b..149336b7b1a2 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.0
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.2
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=~sys-libs/e2fsprogs-libs-1.46.0 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
+DEPEND=~sys-libs/e2fsprogs-libs-1.46.2 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=cron fuse lto nls static-libs +threads elibc_FreeBSD split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.46.0 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
+RDEPEND=~sys-libs/e2fsprogs-libs-1.46.2 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.0/e2fsprogs-1.46.0.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=355769615fdde47d47af40e3dc2575ed
+_md5_=12355e0fa019489dca4f6f0efaa8a3f9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index a7e895ee69b7..6da05ec2c6d3 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index f290e112d6f8..dd178426f9bd 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
index 725f9a63c563..994c715620cb 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.51-FB.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8170537a4890872f8e6fe40afe25e141
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.17
index 96c816d5a10c..f4c35c115e73 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.17
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.17
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-19.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.7.tar.gz -> gentoo-kernel-config-5.10.7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b3e6b18b9b38f8359aa711b38ebadd5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.18
index 39a957b20838..fd23afbd8f52 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.18
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.18
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-20.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7b13a3fa62190f2870b5202856b1f399
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.19
index b58064106ab0..7579cb0166b5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.19
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.19
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-22.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=935226b412a39d879fe0726cdceb5db1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.2
index f8211d176aa8..dc4b1d95d296 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.2
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.2
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-3.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c025e4462a78ea6dc5e88612a8958e8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.100 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.100
index 2fd73f25d144..5a3f25bf0ab7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.100
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.100
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.100 !sys-kernel/vanilla-kernel-bin:5.4.10
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.100
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-102.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-102.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=72eacf124fa8a40b64fc337f469758c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.101 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.101
index f6567082234c..fa5d4f44a172 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.101
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.101
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.101 !sys-kernel/vanilla-kernel-bin:5.4.10
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.101
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-104.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-104.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=16f03a9769e2ed1b2e3caa215d4dccfe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.94 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.94
index e5ea543332cb..25a33430a116 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.94
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.94
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.94 !sys-kernel/vanilla-kernel-bin:5.4.94
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.94
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-96.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-96.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=135a1f9ac032f1cd54195e97b84e51de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.97 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.97
index 93007dafacce..0436c08abaf0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.97
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.97
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.97 !sys-kernel/vanilla-kernel-bin:5.4.97
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.97
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-99.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-99.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d506084f0f133e20004a4175424ba313
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.99 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.99
index f4f3f0bf3791..05a91b81ca91 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.99
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.99
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.99 !sys-kernel/vanilla-kernel-bin:5.4.99
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.99
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-101.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-101.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=28989de296c588f0818441dc536c46b2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17
index 89bfd20d5b63..fcd183023587 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.17 !sys-kernel/vanilla-kernel:5.10.17 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.17
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.17-1.xpak -> gentoo-kernel-5.10.17-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.17-1.xpak -> gentoo-kernel-5.10.17-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a7380310016e1796fc3ea57fe2da094
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17-r1
index 3c5f1c3dff61..7bf0e3b1c35b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.17-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.17 !sys-kernel/vanilla-kernel:5.10.17 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.17
 SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.17-1.xpak -> gentoo-kernel-5.10.17-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2ada635b65a8f836e5083ca2c043a3c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18
index 4ec8d5f1b160..72ede295c7c5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.18 !sys-kernel/vanilla-kernel:5.10.18 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.18
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.18-1.xpak -> gentoo-kernel-5.10.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.18-1.xpak -> gentoo-kernel-5.10.18-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a7380310016e1796fc3ea57fe2da094
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18-r1
index 7196e6b2443b..c66b9234a717 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.18-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.18 !sys-kernel/vanilla-kernel:5.10.18 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.18
 SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.18-1.xpak -> gentoo-kernel-5.10.18-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2ada635b65a8f836e5083ca2c043a3c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19
index 075e60e8d7ae..a761550a14f1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.19 !sys-kernel/vanilla-kernel:5.10.19 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.19
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.19-1.xpak -> gentoo-kernel-5.10.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.19-1.xpak -> gentoo-kernel-5.10.19-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a7380310016e1796fc3ea57fe2da094
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r1
index d41dba925635..2dcda5498ecb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.10.19 !sys-kernel/vanilla-kernel:5.10.19 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.19
 SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.19-1.xpak -> gentoo-kernel-5.10.19-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2ada635b65a8f836e5083ca2c043a3c4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r2
new file mode 100644
index 000000000000..5385ab9594e1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.19-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.19
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.19 !sys-kernel/vanilla-kernel:5.10.19 !sys-kernel/vanilla-kernel-bin:5.10.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.19
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-22.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.19-1.xpak -> gentoo-kernel-5.10.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.19-1.xpak -> gentoo-kernel-5.10.19-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4f839f69e5ef0b07b8809a8f43358bef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2
index e23de9467f54..81c63b5760df 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.11.2 !sys-kernel/vanilla-kernel:5.11.2 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.2
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.2-1.xpak -> gentoo-kernel-5.11.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.2-1.xpak -> gentoo-kernel-5.11.2-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a7380310016e1796fc3ea57fe2da094
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r1
index 79e146945a25..08d9d257e969 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.11.2 !sys-kernel/vanilla-kernel:5.11.2 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.2
 SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.2-1.xpak -> gentoo-kernel-5.11.2-1.arm64.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c83a2f85e46724db2ebd7e7b7b4aa0e8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r2
new file mode 100644
index 000000000000..0407026423e3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.2
+RDEPEND=!sys-kernel/gentoo-kernel:5.11.2 !sys-kernel/vanilla-kernel:5.11.2 !sys-kernel/vanilla-kernel-bin:5.11.2 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.11.2
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-3.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.2-1.xpak -> gentoo-kernel-5.11.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.2-1.xpak -> gentoo-kernel-5.11.2-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fe9ab365a1e1061f3061c5478928e9be
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100
index c9705b07adca..bf438b7de8cb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.100 !sys-kernel/vanilla-kernel:5.4.100 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.100
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.100-1.xpak -> gentoo-kernel-5.4.100-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.100-1.xpak -> gentoo-kernel-5.4.100-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0d42f97e345b6b4e1ac5b235bafb447d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100-r1
index 67258a093d9a..8a6b30c2ccb4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.100-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.100 !sys-kernel/vanilla-kernel:5.4.100 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.100
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.100-1.xpak -> gentoo-kernel-5.4.100-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.100-1.xpak -> gentoo-kernel-5.4.100-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.100-1.xpak -> gentoo-kernel-5.4.100-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55d5aca0cc6b8ee1f0754c1a57e19ced
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101
index 0adaf66e73e5..463694fe6d7f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.101 !sys-kernel/vanilla-kernel:5.4.101 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.101
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0d42f97e345b6b4e1ac5b235bafb447d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r1
index af251f9fd681..e88172a688e3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.101 !sys-kernel/vanilla-kernel:5.4.101 !sy
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.101
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55d5aca0cc6b8ee1f0754c1a57e19ced
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r2
new file mode 100644
index 000000000000..df62ff8c1931
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.101-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.101
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.101 !sys-kernel/vanilla-kernel:5.4.101 !sys-kernel/vanilla-kernel-bin:5.4.101 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.101
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-104.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-104.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.101-1.xpak -> gentoo-kernel-5.4.101-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0ba54e8cccbf199735d2f364d49a76b3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94
index 6d402609f769..9a85a91c68a9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.94 !sys-kernel/vanilla-kernel:5.4.94 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.94
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94-1.xpak -> gentoo-kernel-5.4.94-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94-1.xpak -> gentoo-kernel-5.4.94-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0003de6c669b126ccd3b50ca813329bd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94-r1
index 321bfdfca78c..57c39a142dde 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.94-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.94 !sys-kernel/vanilla-kernel:5.4.94 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.94
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94-1.xpak -> gentoo-kernel-5.4.94-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94-1.xpak -> gentoo-kernel-5.4.94-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94-1.xpak -> gentoo-kernel-5.4.94-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fbf1a8ddc0385b786a6bba99c175029
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97
index fc6b9ceb2704..929e940ffcf7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.97 !sys-kernel/vanilla-kernel:5.4.97 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.97
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97-1.xpak -> gentoo-kernel-5.4.97-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97-1.xpak -> gentoo-kernel-5.4.97-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b6f854efde7d58c63845f4c56d5dc384
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97-r1
index e13dcbad105a..8aa093671f07 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.97-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.97 !sys-kernel/vanilla-kernel:5.4.97 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.97
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97-1.xpak -> gentoo-kernel-5.4.97-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97-1.xpak -> gentoo-kernel-5.4.97-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97-1.xpak -> gentoo-kernel-5.4.97-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55d5aca0cc6b8ee1f0754c1a57e19ced
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99
index a3128ecd3317..26f8c9fca0a2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.99 !sys-kernel/vanilla-kernel:5.4.99 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.99
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99-1.xpak -> gentoo-kernel-5.4.99-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99-1.xpak -> gentoo-kernel-5.4.99-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0d42f97e345b6b4e1ac5b235bafb447d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99-r1
index 15a115d3b6ff..30121d5bc4a2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.99-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.99 !sys-kernel/vanilla-kernel:5.4.99 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.99
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99-1.xpak -> gentoo-kernel-5.4.99-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99-1.xpak -> gentoo-kernel-5.4.99-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99-1.xpak -> gentoo-kernel-5.4.99-1.x86.xpak )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=55d5aca0cc6b8ee1f0754c1a57e19ced
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.17
index ea56114a3122..b5adbf8f548c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.17
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.17
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.17
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.17.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.7.tar.gz -> gentoo-kernel-config-5.10.7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.17.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=3b0d825ee769955f45cd44832e05d8cf
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.18
index 53ab4e61799c..20b20e1f286e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.18
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.18
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.18.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.18.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=d58b2d6efd2162f863fbdc65a9447a23
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.19
index d7fefeaa3b95..9688d8ca2e55 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.19
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.19
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.19.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.19.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=d58b2d6efd2162f863fbdc65a9447a23
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.2 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.2
index d93d0cdcdeca..fd47382d9752 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.2
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.2.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.1 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/07992209452cd7ba529ffdbdd83d01d44cd8ae14/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.1 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=679bbadef4b4b1f4ed0b7074d879f4d3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.100 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.100
index 2d77090dd2ac..f4772b03cc63 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.100
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.100
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.100 || ( sys-kernel/installkernel-gen
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.100
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.100.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.100.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b68de0306115050957ea18536f1a44b4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.101 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.101
index 5eec8c5f3bed..299e061b3da7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.101
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.101
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.101 || ( sys-kernel/installkernel-gen
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.101
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.101.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.101.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b68de0306115050957ea18536f1a44b4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.94 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.94
index 01eb0b5f7e70..765c69b7fed1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.94
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.94
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.94 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.94
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.94.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.94.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b68de0306115050957ea18536f1a44b4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.97 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.97
index b029d17bab2c..b1e9a1ea60f6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.97
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.97
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.97 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.97
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.97.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.97.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b68de0306115050957ea18536f1a44b4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.99 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.99
index d5acbf80b465..c0effd1cb0bf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.99
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.99
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.99 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.99
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.99.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.99.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	5056d1b02c33f32c823f89656ea0524d	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	b54603a5d71c930718ec33528dcce48a	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	69861348186337fa4b269de5826004b3	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b68de0306115050957ea18536f1a44b4
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index fe13d01d1f9b..8bbecba857e1 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/e2fsprogs-libs-1.45.7 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.7
index c781991c5409..4da21fb97c23 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.7
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.7
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.7/e2fsprogs-1.45.7.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=d46cdf52f51df1cea0834cbb8ba23298
+_md5_=4f0018ec4aae50fa2411e80a7c19d2ae
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.0 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.2
similarity index 95%
rename from metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.0
rename to metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.2
index 1f362f9eccf3..76a50e715d6d 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.0
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.2
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.0/e2fsprogs-1.46.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
 _md5_=d46cdf52f51df1cea0834cbb8ba23298
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.92 b/metadata/md5-cache/sys-libs/libstatgrab-0.92
index f845740e5303..aaf70531711f 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.92
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.92
@@ -4,11 +4,11 @@ DEPEND=sys-libs/ncurses
 DESCRIPTION=A tool to provide access to statistics about the system on which it's run
 EAPI=7
 HOMEPAGE=https://www.i-scream.org/libstatgrab/
-IUSE=doc examples
+IUSE=examples
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86
 LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.92.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e94f32bcd84d5a38662990f69bd77dfc
+_md5_=51edbebdadd62f9e742e05208314abc8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index a2ccb86edaa3..d3951ca16f65 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/davical-1.1.9.3-r1 b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
new file mode 100644
index 000000000000..d4cf1e7d6849
--- /dev/null
+++ b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=compile install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A CalDAV and CardDAV Server
+EAPI=7
+HOMEPAGE=https://www.davical.org/
+IUSE=ldap vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+
+RDEPEND=app-admin/pwgen dev-lang/php[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml] dev-perl/DBD-Pg dev-perl/DBI dev-perl/YAML >=dev-php/awl-0.61 virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=1.1.9.3-r1
+SRC_URI=https://www.davical.org/downloads/davical_1.1.9.3.orig.tar.xz -> davical-1.1.9.3.tar.xz
+_eclasses_=webapp	1d03df021d958f89f4cc78e289d0b116
+_md5_=3d2c17ec9123d488f58162fd3ba7f505
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index a25e8bd0dff1..410915e2629f 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libva-2.10.0 b/metadata/md5-cache/x11-libs/libva-2.10.0
index c06e9813ada8..e80b177762ed 100644
--- a/metadata/md5-cache/x11-libs/libva-2.10.0
+++ b/metadata/md5-cache/x11-libs/libva-2.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 IUSE=+drm opengl utils vdpau wayland X video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
 RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/releases/download/2.10.0/libva-2.10.0.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=81b3c294ed4268f0b5b9959b5a44a3ce
+_md5_=f9dbeb172a7c2c6b2f223c3f659b3ea7
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.4.5 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.4.5
index 26e4c0ecc980..bceba2e0c2c9 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.4.5
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-20.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=Intel Media Driver for VAAPI (iHD)
 EAPI=7
 HOMEPAGE=https://github.com/intel/media-driver
 IUSE=+custom-cflags set-as-default test X
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT BSD
 RDEPEND=>=media-libs/gmmlib-20.4.1 >=x11-libs/libva-2.10.0[X?] >=x11-libs/libpciaccess-0.13.1-r1:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/media-driver/archive/intel-media-20.4.5.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	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_=027e6a7dbd7d8f0665064019f003a899
+_md5_=d2c0532bb0e3267d3cc668a3089f187a
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index dce286973c1f..7a7e0950c371 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/stalonetray-0.8.4 b/metadata/md5-cache/x11-misc/stalonetray-0.8.4
new file mode 100644
index 000000000000..9422021a0bcd
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/stalonetray-0.8.4
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd dev-libs/libxslt >=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 prepare
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto
+DESCRIPTION=System tray utility including support for KDE system tray icons
+EAPI=7
+HOMEPAGE=https://stalonetray.github.io/
+IUSE=debug +graceful-exit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm
+SLOT=0
+SRC_URI=https://github.com/kolbusa/stalonetray/archive/v0.8.4.tar.gz -> stalonetray-0.8.4.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b02be0485bb7a18f9ec52c0bfc43d443
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index d5cd2d36f36d..daff59b77f1a 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/light-themes-20.10-r2 b/metadata/md5-cache/x11-themes/light-themes-20.10-r2
index 829f79c8c1d2..648afbbc0b51 100644
--- a/metadata/md5-cache/x11-themes/light-themes-20.10-r2
+++ b/metadata/md5-cache/x11-themes/light-themes-20.10-r2
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=GTK2/GTK3 Ambiance and Radiance themes from Ubuntu
 EAPI=7
 HOMEPAGE=https://packages.ubuntu.com/zesty/light-themes
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
 RDEPEND=x11-themes/gtk-engines-murrine
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-themes/ubuntu-themes_20.10.orig.tar.gz https://dev.gentoo.org/~pacho/light-themes/Gentoo-Buttons-r1.tar.xz
-_md5_=55394a64ba03bff4c604cee9371aa584
+_md5_=ffd2e5e619db31e3ecceab015a06dab3
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ab78afd21b7c..da722d673cd6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Mar 2021 06:38:30 +0000
+Mon, 01 Mar 2021 12:38:30 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6eea530a42e8..26cc183c3407 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Mar  1 06:38:29 AM UTC 2021
+Mon Mar  1 12:38:30 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 24f931e2a1b8..9a47b2d9e750 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Mar 2021 07:00:01 +0000
+Mon, 01 Mar 2021 13:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1d8c6dde45d0..4d4cf3f9ac7f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f64b9d04818823ed73c8a865112ba10c84fbef6e 1614572532 2021-03-01T04:22:12+00:00
+622ebe367c2d47dac3cdcbce2ca72eb7d58c715c 1614601943 2021-03-01T12:32:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4bbe94c4dd92..672897c003ad 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1614580501 Mon 01 Mar 2021 06:35:01 AM UTC
+1614602101 Mon 01 Mar 2021 12:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ab78afd21b7c..da722d673cd6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Mar 2021 06:38:30 +0000
+Mon, 01 Mar 2021 12:38:30 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c4e42e68ccaf..47d62805bfef 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
index 4b56a685b01c..8bce1cc74d0e 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="libressl"
 
 BDEPEND="sys-apps/help2man"
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
index da2628d3c933..5dd5798c2f8b 100644
--- a/net-analyzer/slurm/slurm-0.4.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 7baee21cbd48..cab46acb639a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,10 +1,7 @@
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
-DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
 DIST zabbix-4.0.28.tar.gz 17424006 BLAKE2B f45af54d1e54ff6945f13cc684fbe0506dab4d554f65018fc30758d7b8be6814ca3661655778abb7c24dcbb241b8e6c21f0ea72a01a886392cadc917e699a957 SHA512 1f40c7316f92474beecc9470d4ad6c093a3a005180514307eb3d7aa206fa36d1a8decc20628b1fc0e62bc7a2ff0e508d694da0fe05911314de6f6d7aa726f425
 DIST zabbix-4.0.29.tar.gz 17411987 BLAKE2B 187b6de17403c656c2faa93c8e0952be06ca4fc60e8fe62c48dd9f96371bd26b53f333b93de5805d7333b849f93ff7db6cf1f0cf256cea438afeea5d314e0e83 SHA512 778fe43c2394c572b0f1a6d426897bf24391ebda25cce5bfa0dad63827f5d3457776ecd8186c0b783d400a0d87778d9243fdfedd875136383282e56f542eafca
-DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403
 DIST zabbix-5.0.8.tar.gz 19474050 BLAKE2B 1043efca2f373553728206837949bce5f5ea32328c6289e4028f65e6f1ed76560c1ffbd610eec9855f050d0330bcd3b364a983db896285729f30a693d5ae6c6f SHA512 19601ace704c8a887ffc9b57da8825d8a28a5d064aac3e59480994bee4156db186d37ecf4bee2208bbafc0cb76c0c7f47de964f99953ce78d0187457255d92e9
 DIST zabbix-5.0.9.tar.gz 19513312 BLAKE2B e60fcf300c3fcd9595e9fa8465403e906672fdc908d9a15646e2ac9e88684999184acb3a0b8226dff1966554769930b0ae6d692ee4569441714912c2eb93540f SHA512 7306afce482b8b8222d46c25d91cdd8df2d5bbbeb755bd54b4bf747dc78031cc24167a954e4de5933f33f59772838ff0b4c66d0bf19c28dc1a27276da9bb0b38
-DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
 DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584ddfb45afbe816721d0e69bae4b5e11b44fe5031c8a34562c30fd2818f7b4a8bfb1442489be3ec23a27a70e789f56 SHA512 e218de9a8b9445401e769c14a9efd0b3d1b7e9610ce021cdbfc9db159801a4033b8f1c1a808c853bfa3aeb66db8a6dd0cbb5b44fc1421fa0f54c28589d7314b4
 DIST zabbix-5.2.5.tar.gz 20039761 BLAKE2B 27510c462947a7dedb16d029799aa1c7b38d68199aae47b4b3e5a757120bd74ddf87c7dade0bf339ff2165111345d79119718ade2fe39fd088971be6dcef2bda SHA512 5014a5a510e9ea4a39aa30bdbe3ee82dc1d0a139f32151bb7739df7442ea707b91446ce1cefb61007b603ccedfb0353c628b043db3e90cfe8fc3d67588f2dfd5
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
deleted file mode 100644
index b20bafc87ab0..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
deleted file mode 100644
index 90a6d16b59ee..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.7.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
deleted file mode 100644
index 90a6d16b59ee..000000000000
--- a/net-analyzer/zabbix/zabbix-5.2.3.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-		net-nds/openldap
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  ( sys-libs/zlib )
-	server? (
-		dev-libs/libevent
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? ( net-analyzer/fping[suid] )
-	server? (
-		app-admin/webapp-config
-		dev-libs/libevent
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index a94fc8428da3..80a794c29f6e 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/mgetty/files/mgetty.service b/net-dialup/mgetty/files/mgetty.service
new file mode 100644
index 000000000000..2ca018ed49f4
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Smart Modem Getty
+Documentation=man:mgetty(8)
+
+[Service]
+ExecStart=/usr/sbin/mgetty /dev/%i
+Restart=always
+PIDFile=/run/mgetty.%i.pid
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 606a3a816279..9b94e26536f6 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody/prosody-0.11.8.ebuild b/net-im/prosody/prosody-0.11.8.ebuild
index a23638c3c5c1..59023fe155a3 100644
--- a/net-im/prosody/prosody-0.11.8.ebuild
+++ b/net-im/prosody/prosody-0.11.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib"
 REQUIRED_USE="
 	^^ ( icu idn )
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 543a57c3f62a..ef1225a1fe4b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,4 +1,4 @@
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.5.6981.0202_x86_64.tar.xz 50898976 BLAKE2B f6029dec4b082bdf9d74e31b04e0c1994b238c5e19482d5b0bdcbc6214c87e8e94ef527ae6a6dff4a96973d4cec3e40f369810b4b1b21abe20d64e0cccd0b15c SHA512 f408a292543028e2262ac1c528be0c38e0fbba61e641c4549bec1ef9e2283f5eb041e68cfd770d87e67e31dc51a27f3ca15c23cc2d82452568518cb0ee97f132
 DIST zoom-5.5.7011.0206_x86_64.tar.xz 50893408 BLAKE2B 1d03f7fd1f0b7477ba2ff023f1b1f5fd26b0a8a3ac2a54170d3ec3e034a707a824e0b52f6bc3c144be414a28b2587f451d3b6990df02f4ce5df10530c00d1b6a SHA512 c427ed744138b5ef2c741970138e1ad91b5384a020c12451d30b411c8b533e3ffdc4ca785e73a8707d47f53bdd7b9af4e5ffe695ef7de75e1959150730aca913
+DIST zoom-5.5.7938.0228_x86_64.tar.xz 50938368 BLAKE2B e8a45c95db2080092674441f16d4bdeeadbe8999483f3ac7ba2da3afb1b340fb3f03cb879a97dd93512159f5a6ff57996782d7b4137547aa78c652c3c40b2641 SHA512 76d3d1dc3c8772636db59f8b641241c4910a54c0e71d33e3f51960d85fd5957536d0e5bbd20870fb7fc1af1457344a3567d7f46bcdfe99774bb87280b14e812c
diff --git a/net-im/zoom/zoom-5.5.6981.0202.ebuild b/net-im/zoom/zoom-5.5.7938.0228.ebuild
similarity index 92%
rename from net-im/zoom/zoom-5.5.6981.0202.ebuild
rename to net-im/zoom/zoom-5.5.7938.0228.ebuild
index 6e49d223e0fc..7ae87da3f7bd 100644
--- a/net-im/zoom/zoom-5.5.6981.0202.ebuild
+++ b/net-im/zoom/zoom-5.5.7938.0228.ebuild
@@ -18,7 +18,8 @@ RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip
+	dev-libs/quazip:0=
+	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-sound/mpg123
@@ -90,7 +91,13 @@ src_install() {
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 4d7cd9d84a3b..0fb345b1408c 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
index ec54ddf561d8..19fef3485eec 100644
--- a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0deac3d8a9c4..3b05021b7bb8 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b856df2ac288..4ce479127c07 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8806,7 +8806,7 @@ x11-misc/rss-glx:quesoglc - Enable support for OpenGL Character Renderer
 x11-misc/sddm:elogind - Use sys-auth/elogind for session tracking.
 x11-misc/sent:savedconfig - Without a saved config.h, this package depends on media-gfx/farbfeld for image conversions
 x11-misc/spacefm:video-thumbnails - Support video thumbnails with media-video/ffmpegthumbnailer
-x11-misc/stalonetray:graceful-exit - use non-portable hack to exit gracefuly on signal
+x11-misc/stalonetray:graceful-exit - use non-portable hack to exit gracefully on signal
 x11-misc/tint2:battery - Enable battery status plugin
 x11-misc/tint2:tint2conf - Build/Install tint2conf as well
 x11-misc/urxvt-perls:deprecated - Install scripts which have been marked as deprecated by upstream
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e3fa35fc89f4..30127226a167 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index c85ef401c04f..6a29d4e0855a 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,3 +1,2 @@
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-DIST cantera-2.5.0.tar.gz 2479888 BLAKE2B be3dd9ae1b0d9b555b9ddd6ad78a2a6a675844903e4c10ef5e4a09c66d5ca01f81f49f35ee195597d71140dcc4da9750e82f71c6553b5f0ef8a122bf63b86cc1 SHA512 4f1763a74a4a938c6d4512ab574bcbbb84ea6e8c9814c612e6ff6cba0bec1209252ef7c21004e0df98a84279cf66bd137220233dad0ebbcfc89e9a273d753478
 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
diff --git a/sci-libs/cantera/cantera-2.5.0.ebuild b/sci-libs/cantera/cantera-2.5.0.ebuild
deleted file mode 100644
index 5f3b8c1280bd..000000000000
--- a/sci-libs/cantera/cantera-2.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/ruamel-yaml[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	dev-cpp/yaml-cpp
-	<sci-libs/sundials-5.3.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-		python? (
-			$(python_gen_cond_dep '
-				dev-python/h5py[${PYTHON_MULTI_USEDEP}]
-				dev-python/pandas[${PYTHON_MULTI_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${FCFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-		## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		system_yamlcpp="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
new file mode 100644
index 000000000000..7e2bb1d7b2ab
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
@@ -0,0 +1,31 @@
+From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 24 Feb 2021 20:06:02 +0100
+Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
+
+Fix an unbalanced nesting of flow control statements
+for >=cmake-3.20.0
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ adm/cmake/vtk.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index c5692fd6..00b7ff4a 100644
+--- a/adm/cmake/vtk.cmake
++++ b/adm/cmake/vtk.cmake
+@@ -156,8 +156,8 @@ if (VTK_FOUND)
+             endif()
+           endif()
+         endif()
+-      endif()
+-    endforeach()
++      endforeach()
++    endif()
+   endif()
+ 
+   if (3RDPARTY_VTK_INCLUDE_DIRS)
+-- 
+2.30.1
+
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index d46a66fe6008..2c5adfb7524f 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -49,7 +49,10 @@ RDEPEND="
 		dev-qt/qtxml:5
 	)
 	tbb? ( dev-cpp/tbb )
-	vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+	vtk? (
+		>=sci-libs/vtk-8.1.0[rendering]
+		<sci-libs/vtk-9
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -75,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-install.patch"
 	"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
 	"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
+	"${FILESDIR}/${P}-fix-flow-control-nesting.patch"
 )
 
 pkg_setup() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d4ae5c11aa7f..1a150b499ab1 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index d12d038db90a..d243c5691c3b 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 "
 
 BDEPEND="
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
@@ -40,13 +41,12 @@ BDEPEND="
 	>=sys-apps/coreutils-8.16
 	sys-devel/m4
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
 "
 
 S="${WORKDIR}/systemd-${PV}"
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -55,6 +55,10 @@ src_prepare() {
 	use elibc_musl && eapply "${WORKDIR}/${P}-musl"
 	use elibc_musl && eapply "${FILESDIR}/musl-1.2.2.patch" # https://bugs.gentoo.org/766833
 	default
+
+	# https://bugs.gentoo.org/767403
+	python_fix_shebang src/test/*.py
+	python_fix_shebang tools/*.py
 }
 
 src_configure() {
@@ -188,7 +192,6 @@ src_install() {
 
 src_test() {
 	# 'meson test' will compile full systemd, but we can still outsmart it
-	python_fix_shebang src/test/test-systemd-tmpfiles.py
 	"${EPYTHON}" src/test/test-systemd-tmpfiles.py \
 		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
 }
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b4dcc9eaeff1..bd1fa76fc080 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 380ebad15a86..6ee7e5d71445 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1 +1,2 @@
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
+DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
new file mode 100644
index 000000000000..04a8edd74593
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Similar to dd but can copy from source with errors"
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
+
+RDEPEND="lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.9-musl-r2.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-ldl:$(LDFLAGS) -ldl:' \
+		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
+		Makefile || die
+
+	if ! use cpu_flags_x86_sse4_2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
+			configure.in || die
+	fi
+
+	if ! use cpu_flags_x86_avx2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
+			configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# OpenSSL is only used by a random helper tool we don't install.
+	ac_cv_header_attr_xattr_h=$(usex xattr) \
+	ac_cv_header_openssl_evp_h=no \
+	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
+	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
+	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
+	econf
+}
+
+_emake() {
+	local arch
+	case ${ARCH} in
+	x86)   arch=i386;;
+	amd64) arch=x86_64;;
+	arm)   arch=arm;;
+	arm64) arch=aarch64;;
+	esac
+
+	local os=$(usex kernel_linux Linux IDK)
+
+	# The Makefile is a mess.  Override a few vars rather than patch it.
+	emake \
+		MACH="${arch}" \
+		OS="${os}" \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
+		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS_OPT='$(CFLAGS)' \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		CC="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	append-cflags -fcommon # bug 707796
+	_emake check
+}
+
+src_install() {
+	# easier to install by hand than trying to make sense of the Makefile.
+	dobin dd_rescue
+	dodir /usr/$(get_libdir)/${PN}
+	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
+	dodoc README.dd_rescue
+	doman dd_rescue.1
+	use lzo && doman ddr_lzo.1
+}
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
new file mode 100644
index 000000000000..1089a63f06c7
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
@@ -0,0 +1,30 @@
+From 28818d18cfc7a459675ac388e5cf7b50bdd9ad89 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH] loff_t and __WORDSIZE includes for MUSL
+
+Rewrite of Justin Keogh's patch [Link 1] to fix build problems
+on ARM.
+
+Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
+Fixes: https://bugs.gentoo.org/616364
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 813accf..5a8246c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,7 @@ AC_C_INLINE
+ AC_HEADER_STDC
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+-- 
+2.31.0.rc0
+
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0a60d89e1532..bce1a9e8801c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,5 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
-DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
+DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
index 301a34b1b5a1..cac1c8c486ef 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
similarity index 98%
rename from sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 7a9dd3fa1afc..963bf42ad0c5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
@@ -32,7 +32,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
 	# Upstream patches (can usually removed with next version bump)
-	"${FILESDIR}/${P}-pthreads_build.patch"
 )
 
 src_prepare() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch
deleted file mode 100644
index 9d251d2f0b37..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 24487a7fa64bfa92bea21be3ca8c155e5de7438f Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Fri, 29 Jan 2021 22:28:31 -0500
-Subject: configure.ac: fix build failure on systems with pthreads && !fuse
- support
-
-The configure script checks for pthread.h as part of double-checking
-that the FUSE support works correctly, which implicitly defined
-HAVE_PHREAD_H.  If the FUSE libraries are not present (or fuse support
-is explicitly disabled), this check doesn't happen and so
-HAVE_PTHREAD_H is not defined, and this causes a build failure.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- configure    | 2 +-
- configure.ac | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 9d41d069..6b8b7f4b 100755
---- a/configure
-+++ b/configure
-@@ -10448,7 +10448,7 @@ fi
- done
- 
- fi
--for ac_header in  	dirent.h 	errno.h 	execinfo.h 	getopt.h 	malloc.h 	mntent.h 	paths.h 	semaphore.h 	setjmp.h 	signal.h 	stdarg.h 	stdint.h 	stdlib.h 	termios.h 	termio.h 	unistd.h 	utime.h 	attr/xattr.h 	linux/falloc.h 	linux/fd.h 	linux/fsmap.h 	linux/major.h 	linux/loop.h 	linux/types.h 	net/if_dl.h 	netinet/in.h 	sys/acl.h 	sys/disklabel.h 	sys/disk.h 	sys/file.h 	sys/ioctl.h 	sys/key.h 	sys/mkdev.h 	sys/mman.h 	sys/mount.h 	sys/prctl.h 	sys/resource.h 	sys/select.h 	sys/socket.h 	sys/sockio.h 	sys/stat.h 	sys/syscall.h 	sys/sysmacros.h 	sys/time.h 	sys/types.h 	sys/un.h 	sys/wait.h 	sys/xattr.h
-+for ac_header in  	dirent.h 	errno.h 	execinfo.h 	getopt.h 	malloc.h 	mntent.h 	paths.h 	pthread.h 	semaphore.h 	setjmp.h 	signal.h 	stdarg.h 	stdint.h 	stdlib.h 	termios.h 	termio.h 	unistd.h 	utime.h 	attr/xattr.h 	linux/falloc.h 	linux/fd.h 	linux/fsmap.h 	linux/major.h 	linux/loop.h 	linux/types.h 	net/if_dl.h 	netinet/in.h 	sys/acl.h 	sys/disklabel.h 	sys/disk.h 	sys/file.h 	sys/ioctl.h 	sys/key.h 	sys/mkdev.h 	sys/mman.h 	sys/mount.h 	sys/prctl.h 	sys/resource.h 	sys/select.h 	sys/socket.h 	sys/sockio.h 	sys/stat.h 	sys/syscall.h 	sys/sysmacros.h 	sys/time.h 	sys/types.h 	sys/un.h 	sys/wait.h 	sys/xattr.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-diff --git a/configure.ac b/configure.ac
-index 141c4d9c..42b6f486 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -975,6 +975,7 @@ AC_CHECK_HEADERS(m4_flatten([
- 	malloc.h
- 	mntent.h
- 	paths.h
-+	pthread.h
- 	semaphore.h
- 	setjmp.h
- 	signal.h
--- 
-cgit 1.2.3-1.el7
-
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 960c5042093c..1584e68c92f9 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag>
 	</use>
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 3bdb5e190ea9..2134ad6995a9 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
 		<flag name="minimal">Don't install python scripts (arcstat, dbufstat etc) and avoid dependency on <pkg>dev-lang/python</pkg></flag>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9d9b98afbff4..e669a691c60b 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1c0f24915fd1..03a7364cb107 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,3 +1,9 @@
+DIST genpatches-5.10-22.base.tar.xz 554876 BLAKE2B 18d2a41fea4a8a95983a71185248f9fd27d2f4e8863419eaae66cf826ecd74218e0563804262368f3d23bee1f835b18869644af734f0baa8d1266a37ff495061 SHA512 7fca3a5fcd35425b0d6aa37cd0eb1146c6fec8ae5f4a462f058180057e956a4316a26a0c0600780014ffe2f632cf64f135f8d0b337ca6642a949c3654783a4c0
+DIST genpatches-5.10-22.extras.tar.xz 1772 BLAKE2B 3a72d1838aca6ca79985e06d9efc44a10bc3e766431c2ebca64b773c96be52cf27f121331585030e334d2eb7d1415deb34f42c265619b16186fb406baa12bd23 SHA512 81559580dda2d4ecbe693eb25d9d537f0d3dc3a01c1a863f17eff3b0e890a2850bdbb7ed5e856bf6b9c7dde944dd771710a8b64812391b5a3c214cc0e2c8538f
+DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
+DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
+DIST genpatches-5.4-104.base.tar.xz 3093716 BLAKE2B da8a9f572f4a22eb101a477ed2b2a81b0adaed65f1913c163b58dc958de661707733fb1e0d06e49ec342666ca0c212313d3a5fbca60c79779009b91361e23f42 SHA512 2ef214d2e4ea982c6702991519aaa183d6731f882fa59db5cc2d7832c7fcaf8de57dc2173f4a59922e5d90da2d046753b3eed609513c84c784c13d5be747303b
+DIST genpatches-5.4-104.extras.tar.xz 1768 BLAKE2B 7f335d61bd5f44cfa74ce2082259a48791ed90c21da4d05ff13c191adf1f658e68634c4cf9779274e6f775409695634ca40187754b0f9d50b406c26df26adbc4 SHA512 a8080605c59079063065d9bebc9d846ab8aab73f2f192f6c5becea2b51304a1e4d91e20d9aacd61f2cfa5b967bb8e30d620ddd60592017f308ad2f65ab7287a5
 DIST gentoo-kernel-5.10.17-1.amd64.xpak 64346939 BLAKE2B 3387154f735f5f6f50df4fd236c65a1f7c0b4c2257f637bca75d6569c5ac2f3d841828ee94b0072e3edfad947487157d9c42c3add280e97786947fbd305e851d SHA512 7572525cedbbce2d5a2478ab50afac686b01a213af110a570d514c6a7c439e5f5957fcd95c643db3ce1201c50944f64bbbb9a10a38f803cfcf7d3de1368847c2
 DIST gentoo-kernel-5.10.17-1.arm64.xpak 59606648 BLAKE2B 444e43a12a94310b00ed686d3225b61284207f93995bc75375d66435ba22cde42a1882fb1ff7479f1ed6ba369c509de11ba453a945f6608de83b1f121a5fb4e2 SHA512 998cc8342ab5e68f74a80ddf6f1fea68a618139492f5c078eb5c1619611f5635a0635ff362f9414c9518011868bd0f3bf12f110e5e5717e32c728e5f369a6b50
 DIST gentoo-kernel-5.10.17-1.x86.xpak 57292329 BLAKE2B 824b77875aa1336fff7b9f054f837904462c429b625a5085296dcaeee156c2d794242fb35d2d0fd20fb6e8230895bcb5a8b334f04b86034c0818bc0b740f8b66 SHA512 bde8d238b592f7aacf63f3b4464790d3df5901bc772850ec991957c849b634790665a2b9affd0484107017d909a45eb6634a0c345b73bd77274c3101432bacee
@@ -25,3 +31,6 @@ DIST gentoo-kernel-5.4.97-1.x86.xpak 52892614 BLAKE2B 7faee99492c9b319b3bbbf4518
 DIST gentoo-kernel-5.4.99-1.amd64.xpak 61077919 BLAKE2B 1d0bab84d8dba7b3c8495ef5fb2fde5cd5290579cad51e2e5c9714d02263b2b621f5c982d6c00285b469476595c540e7a93e2de8f6caf4a89b6a8e7cc123ad51 SHA512 74c92c49875e8d80e0afc2ea5198d613982d24afc300c9b9a4fdcb97689d1dd00fc5f9bdb795bc609dd12b8f1b671ddf4937860e4d94401da580e17090cd534a
 DIST gentoo-kernel-5.4.99-1.arm64.xpak 56363608 BLAKE2B a082403950475a9b398c0f8fbadd371f81d2aa01160bc3656a104dfdd342f9a98979e3701ce5b7d6042c0a4ba7cf33b34de8c6bf7a98356694b33e78dd461bfe SHA512 562706e5f84240d631886ba677292aed84935deb13abbf8fd0ce023772008fffd0cdc9a965b61fc7c38fbd4235b8221c4d2af717ef7c690fbfec621d3c564134
 DIST gentoo-kernel-5.4.99-1.x86.xpak 52893402 BLAKE2B 9964fb97580c87e15248c81e48352a4efecb6b278a3a087e0752484103ca87ccdb16c360d0c1db34a6874c3234fc0dd6502e012d601d381cb4ec402f92bffd55 SHA512 94d985d0b20fd0903539888308cb543d21374b523c5b4d95eecf0589a5a3998ac139b667056975431043efa9691d61755b11c902e4b2f8e9e4cc063b82192129
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.19-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.19-r2.ebuild
new file mode 100644
index 000000000000..23f4f294c63e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.19-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.2-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.2-r2.ebuild
new file mode 100644
index 000000000000..d52b4878b2df
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.2-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.101-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.101-r2.ebuild
new file mode 100644
index 000000000000..a0b88046a197
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.101-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${PV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${PV}"/ || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5da057e093d4..dd13385c4f9f 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 58c009cbf29b..e39022148ae5 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,4 +1,4 @@
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
-DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
+DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild
index 41da9ca3221d..5f7adac9f26c 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild
similarity index 100%
rename from sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild
rename to sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild
diff --git a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
index 5210d97f618d..aee5352b1938 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libst
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}"
@@ -36,7 +36,7 @@ src_install() {
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
 		docinto examples
-		doins -r examples/*
+		dodoc -r examples/*
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 26ea3e4df3f0..db73a77ff5de 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild
new file mode 100644
index 000000000000..4b2bc1b3ed47
--- /dev/null
+++ b/www-apps/davical/davical-1.1.9.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="https://www.davical.org/"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+BDEPEND="sys-devel/gettext"
+
+# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908)
+RDEPEND="app-admin/pwgen
+	dev-lang/php[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml]
+	dev-perl/DBD-Pg
+	dev-perl/DBI
+	dev-perl/YAML
+	>=dev-php/awl-0.61
+	virtual/httpd-php"
+
+PATCHES=( "${FILESDIR}/${P}-php8_compatibility.patch" )
+
+need_httpd
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake built-locale
+}
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/. htdocs/.htaccess
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale
+	rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/.
+
+	insinto /etc/${PN}
+	doins -r config/. "${FILESDIR}/vhost-example"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
+
+pkg_postinst() {
+	elog "If you are upgrading from a previous version of davical, don't forget to"
+	elog "upgrade the database structure with"
+	elog "       cd /usr/share/webapps/davical/${PVR}/sqlscripts/"
+	elog "       ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx"
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
new file mode 100644
index 000000000000..de9db47ff7fe
--- /dev/null
+++ b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch
@@ -0,0 +1,58 @@
+From f376be164eacf51d7354c728094e697ee2336218 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:46:32 +0100
+Subject: [PATCH 1/2] Use brackets instead of curly braces for string offset
+ access
+
+Curly braces have been deprecated in PHP 7.4 and unsupported in PHP 8.0.
+---
+ inc/check_UTF8.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/check_UTF8.php b/inc/check_UTF8.php
+index e3c93dbf..62dbfc00 100644
+--- a/inc/check_UTF8.php
++++ b/inc/check_UTF8.php
+@@ -67,7 +67,7 @@ function utf8ToUnicode(&$str)
+ 
+   $len = strlen($str);
+   for($i = 0; $i < $len; $i++) {
+-    $in = ord($str{$i});
++    $in = ord($str[$i]);
+     if (0 == $mState) {
+       // When mState is zero we expect either a US-ASCII character or a
+       // multi-octet sequence.
+-- 
+GitLab
+
+
+From 6cdbfcf226f0235a00206edfd119fcc90465a2b8 Mon Sep 17 00:00:00 2001
+From: Jan Hicken <jan.hicken@posteo.de>
+Date: Sun, 31 Jan 2021 11:47:41 +0100
+Subject: [PATCH 2/2] Add default value for errcontext variable in error
+ handler function
+
+This variable is no longer passed in PHP 8.0.
+
+It cannot be removed however, because it would not be backwards
+compatible.
+---
+ htdocs/setup.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/htdocs/setup.php b/htdocs/setup.php
+index 8b13d0ad..2a82dbf3 100644
+--- a/htdocs/setup.php
++++ b/htdocs/setup.php
+@@ -13,7 +13,7 @@ function log_setup_error($errno , $errstr , $errfile , $errline) {
+   error_log('DAViCal setup.php: Informational: '.$errfile.'('.$errline.'): ['.$errno.'] '.$errstr);
+ }
+ 
+-function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext ) {
++function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext = null ) {
+   if ( $errno == 2 ) {
+     // A working installation will regularly fail to include_once() for several files as it searches for the location
+     log_setup_error($errno , $errstr , $errfile , $errline);
+-- 
+GitLab
+
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index edb42791233a..eb86b66c8c5b 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
index 33551ed4938f..7e51437dd247 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index f5c04442c6ea..87e992634ed2 100644
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ b/x11-libs/libva/libva-2.10.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 83090b370cc8..d9167c70762a 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index 98ae718aa32d..35ae306a81f0 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -1 +1,2 @@
 DIST stalonetray-0.8.3.tar.bz2 155276 BLAKE2B 68041239df7d3441f9abd279cec55ff11deb0ef73eb984be8ad2f0348285164c112918c9e850e5fd2a994144a0c84429164e9f46a0baf81a29ed763b750ffce7 SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942
+DIST stalonetray-0.8.4.tar.gz 94614 BLAKE2B 4def696bbd580960f2d7fd84516658e4b4112b40989523840566d34dac71ba92e3adf021796059db919515cc978ac0c5d7783a4ed41aa9f82c8cbcfd00bc958b SHA512 3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index 5f630340ef1f..c3b369f27a31 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
+		<flag name="graceful-exit">use non-portable hack to exit gracefully on signal</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">stalonetray</remote-id>
diff --git a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
new file mode 100644
index 000000000000..602d6943d3ad
--- /dev/null
+++ b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="System tray utility including support for KDE system tray icons"
+HOMEPAGE="https://stalonetray.github.io/"
+SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +graceful-exit"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="app-text/docbook-xml-dtd
+	dev-libs/libxslt"
+
+DOCS=( AUTHORS BUGS COPYING NEWS README.md TODO stalonetrayrc.sample stalonetray.html )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable graceful-exit) \
+		--enable-native-kde
+}
+
+src_compile() {
+	emake
+	emake dist
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 0919382428ca..7ec4e985ce3d 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/light-themes/light-themes-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
index 78e6584d3690..fd7aee3d71eb 100644
--- a/x11-themes/light-themes/light-themes-20.10-r2.ebuild
+++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"