diff --git a/Manifest.files.gz b/Manifest.files.gz
index 481f19a9ca4b..6fd2d7330a69 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 fafaa3afeac8..f486b08bc3d5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0cc9e8a6b521..c47cc4c13eb5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,3 +4,4 @@ DIST awscli-1.20.61.tar.gz 2090747 BLAKE2B ddd0ca28f0f36a69e0d03a15bab142df35f46
 DIST awscli-1.20.62.tar.gz 2091052 BLAKE2B 95043ddac83c71a6153eb84b9e2e48ea5659d300fdec3bf4c7d0356d214da7a5ec15a0777c1eb41f275a2ee6fdf7996d28082fe604825234226a415e9c12181c SHA512 6f33f1a02703b81813c56872f4a90e712ef60775854d88f256c1c6fa487678f6bc8f5d8a4345b2a064ff18afaf9f5e336f4af0257fc746d83a703fcc4a655bc4
 DIST awscli-1.20.63.tar.gz 2091148 BLAKE2B 12e6aebf29b5d91b191f87568fb605513c86d30c2a4d6b553ab2a0fb90b6aa0bd4b7024981671566f0646811f39a88bc16ac888f511c29b0e459f86440300304 SHA512 adb57d355a7ba70cf166ea1544df4274caaedbea1a2c4ba7895be600a76d8ef0129ca20c6d03d702c073d21dfa4f70fa3f5488266dc0cc5ef7f5d952b6d6ee6f
 DIST awscli-1.20.64.tar.gz 2091360 BLAKE2B 24a0838f1348a05392736f580816b968cd28a252ade31559241fadc5cb2a36dcb6f31c8743c484879fc523b0282381625cbabd58656a00cce0dcb81a6b0319d4 SHA512 a3c0b393e9a5e7aee0e4e4bab14f2cb2c0877b22ead0547d99b430e24bd927391536bbae8b612612b9437dc0dba2cd804a858bddc980d29a74afac434ddc3ab3
+DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e98e22bbcb58a87da174687af8ebdf693a94f04949119d544daaf6fb9bfe4388444d9ec8a24c0e8b67d202e75753 SHA512 dd943682d10212179ebba959b8919a07ba0b548c5f24f735c69c05f9e1c27efa3f74c45d9702b96c4e556a6b436947d34da88291fc5718386891a3425a738c84
diff --git a/app-admin/awscli/awscli-1.20.65.ebuild b/app-admin/awscli/awscli-1.20.65.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.65.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
index 5431dc042cab..52cc5e43f884 100644
--- a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
index 1c622b0ee6a7..82253adc9ab4 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2afbe64897c9..7faf77d14c1e 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,4 +1,2 @@
-DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
-DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30
 DIST puppet-agent_7.11.0-1focal_amd64.deb 20968988 BLAKE2B 41c1464290fc38b9bb2a79384c6c427ec8cd1332b3ccba155cb26d43a87b36931415d3a54a10ae8f6a1322f02eeaef27147d4af7304f541ce38e668b072cc03c SHA512 38024f80af5ef69a1db22f9ed90b7b00af5183988b2029fa63a8b2fa1de1c189ba164d8cd450156c4d822a3e6404e5933ca09efdd4eeee7188c99791991a9921
 DIST puppet-agent_7.12.0-1focal_amd64.deb 20971412 BLAKE2B afb9af877e578b6ae24566e0688d14fa67fdb133a3fd9e15dc2473ea76f61a6551bd69a6fad18b6b555eea2afa8fd858a005f2c1cf6681c28f4422129211dea9 SHA512 f5fdab728baa7813f31ba174b0ee7e9dee3f5f954ed46a2f6740cf6ad075c8f36a1b6cb28e7c6223eb4aad02400252114a5dcede0085f7a7e7ba079bad2aedf9
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild
deleted file mode 100644
index 8ef74d148ca4..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild
deleted file mode 100644
index 77dd8d3fbcfa..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt[compat]
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index dd3d78ae1118..ad48cb8c99e3 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,4 +1,3 @@
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.10.0.tar.gz 2856888 BLAKE2B 9322d59f0a8af26343f474e7b4295dfa3bfc105137498d7333776abf366c35fe66af137595ca26ea0d8cf0474151e290825240b4ee87679f25a817fa0ffdeb9d SHA512 686a9023549fb137d49c381f9c21402451503531d3edc4381a0c80dda584eac1621b1a33013e63c07158c8cec08c6e864ba70d0be4cd0c2cfeaf4f9fce9ed36a
 DIST puppet-7.11.0.tar.gz 2860556 BLAKE2B 4db6e9ba7da3c3fa8af845a9afa4a1029ae9f6e33b1a3977ab06058bdd1c230ec2cb7a7bbe54bfd6a193093f3020136f9dcfcb035f5031c06885d1df51b0f467 SHA512 dca5359c4caa07296c1ae79840d56b96b506521a9b7f32ff5aa4fbecb6277b579dff2f4d0df0c939d5f466f55b56ac8c7e2bd0ad83c024bf403f2652ecac3988
 DIST puppet-7.12.0.tar.gz 2862376 BLAKE2B da0d3d05de8187492cbb14d98df0c7eef7fea5a2fdad0f41b687fcef20979d34c1d84513c4c7a504eb95934228b832e416aecb5f626fba20920df286fd403bcd SHA512 5df5b78d5e27ff64e49f440c6e3add7af1b58cd4da6ac5cd649dce012e830e349c2dbc27bf03d4668e2a10cec6628b2872457c7b6f7fe7a4f7cfbd6c8fe8ae2d
diff --git a/app-admin/puppet/puppet-7.10.0.ebuild b/app-admin/puppet/puppet-7.10.0.ebuild
deleted file mode 100644
index f2b79f3d4dc9..000000000000
--- a/app-admin/puppet/puppet-7.10.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet.conf
-
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b7c1e958c950..6df66acff939 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,2 @@
-DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927
 DIST puppetserver-7.4.0.tar.gz 63333332 BLAKE2B 43e1301f62d49868baf10fffe74e103633547bc66d845c01be851fa78ba0a361600913e11cbe340bae881d0c85c2bf74e290cfdff1bd9f1012562537389230ce SHA512 54b9be31b38662a4d02efc1f00a24bba269f7c69e2bb3af2402b2cb61aa8a6be5a9ef82ce883a7ca805068f45e895ab3b2026179fe298a3a451dc30ed7404a5b
 DIST puppetserver-7.4.1.tar.gz 63334102 BLAKE2B 904f3f0a84a0954aef029f42623fd49480b98ff28b3c229205ea7c41c9db1c026c5408ae74775fe9fe598f95b43289ffc0fd34c384ffdd3a2a662382ae1f577f SHA512 6212ddc4b583f9e26227b5db25e7771684aca607787f8ee80920eaf398dd65d4f901774b0e439f006a2fc6a22e9143a1fc58b9003ecd59a115da7702a88210dd
diff --git a/app-admin/puppetserver/puppetserver-7.3.0.ebuild b/app-admin/puppetserver/puppetserver-7.3.0.ebuild
deleted file mode 100644
index c2df215b358d..000000000000
--- a/app-admin/puppetserver/puppetserver-7.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetserver.conf
-
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 517ab684f5f8..65d72deeb41d 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/stoken/stoken-0.92-r1.ebuild b/app-crypt/stoken/stoken-0.92-r2.ebuild
similarity index 61%
rename from app-crypt/stoken/stoken-0.92-r1.ebuild
rename to app-crypt/stoken/stoken-0.92-r2.ebuild
index 2508df6bacdf..9cf7d5d6aeb7 100644
--- a/app-crypt/stoken/stoken-0.92-r1.ebuild
+++ b/app-crypt/stoken/stoken-0.92-r2.ebuild
@@ -12,19 +12,30 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="gtk static"
+IUSE="gtk static-libs"
 
-#	|| ( dev-libs/nettle dev-libs/libtomcrypt )    libtomcrypt is not packaged
+# TODO: add a USE flag to enable optional use of tomcrypt instead of nettle.
 RDEPEND="
 	dev-libs/nettle
 	gtk? ( >=x11-libs/gtk+-3.12:3 )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
-	eapply_user
 }
 
 src_configure() {
-	econf $(use_with gtk) --enable-static=$(usex static)
+	local myconf=(
+		$(use_with gtk)
+		$(use_enable static-libs static)
+		--with-nettle
+		--without-tomcrypt
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 6e4eefa2eeec..f70db6c36074 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/sen/sen-0.6.1_p20200905.ebuild b/app-emulation/sen/sen-0.6.1_p20200905.ebuild
index fe1a19b03c8f..01c320dce915 100644
--- a/app-emulation/sen/sen-0.6.1_p20200905.ebuild
+++ b/app-emulation/sen/sen-0.6.1_p20200905.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 COMMIT="02e5872ee2905861e1da06ab5174e1a3f41f0e0b"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index e7d69181a5a5..ec69e0d42737 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,3 +1,3 @@
-DIST VBoxGuestAdditions_6.1.22.iso 61020160 BLAKE2B e6b79942ed905654ac98323fe5c960afe7467e4ee9da168f7a7b4856a001fa973418e979da57b6e75eedd801bd71f15700ac62a2dfac28b660b36b11287fab57 SHA512 826a4b7d714d1dcb3e7c5c3c95e2a47d2fef728172f2db0e9c983150d7cc335ca7ffd2c87c09e1ca3d0fb1342f4c6c03993f5fc8cff19f28e1f519dec0f3f96b
 DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b8671066154133795e8e4f50ac82e927e82e05594c520b155f29f7f19373e5846c36a1e3f6e5d2f5d17db1cebc1996c4d1737d5b45862 SHA512 8753558fcf467805bff801be43281597ef6738f90f8f7a62f6acbba2753e57f44bc72cb66411f0a0f413135026ddf683b0330b49ccad77676ec67b7bf3faf06e
 DIST VBoxGuestAdditions_6.1.26.iso 61073408 BLAKE2B 0711cb37ef21ce2fc277f1817d173f25686ae8f1f3cf983c93975f0e00df5e8e416f6bceaef3e1d1e30d0f3703186f9686a360a00683a89e5620603a41c21e63 SHA512 b1d9f02a740e61a8fdee7d8bc2ed87bbd4913ad367e8f1b7b964c496f9b10126337715cdcf5a3eb0fd299b11ae6324de8dd09657a55a7976dd14143a2d4ba285
+DIST VBoxGuestAdditions_6.1.28.iso 62226432 BLAKE2B 0f2d4076476945466cd5d3c5e3064c0f23e511596933d29cd7bab275ee1a21ac5fb81a4723c342f79946000e97681a5e9875cba006bdee6ec684169abd5e04d9 SHA512 2801c78909bdd38b623e958ce61154da7aa2ababf6e7723baf50e958afd1a8d4b0930800fe5549f728a7ac7979d8fa1597c969bf28743d7266b16ccc1b5960bb
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
similarity index 92%
rename from app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
index 5f7f607a912a..4a54ecd35f58 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN=VBoxGuestAdditions
 MY_PV="${PV/beta/BETA}"
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index fd8c4f815331..00486c8fc731 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,3 +1,3 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz 11133865 BLAKE2B f0db84695d94d914afd22086ced2a2ca73f860a0bc91bc11744e2cc4a3203584b06f7c855053e33c5f775bc7f6db08b7400f5eeea89566b9146dd144ccf1a2f9 SHA512 71dc1a82b9b88f615ecc7172df344042366a9303115cf44685ea96e3e729b8280edd36377b207fdbbf8adb388d1ec9b21c3ee709cf44aeb52d6811b26fa69a80
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc35eb8ab1a58492ca3b67b63885ffa1ad3ed3a51a9e7e8c522845b082c420fb39a31a379ee56b45c9b02452acc5be4d72c5a5d9bddaa428bf7c9a3a086 SHA512 e2af2213e99c8c35a3090f5e36d05b1ef27c920cd31a2bf97b0368a89f27a5e2d0e0e0dced5e4e7bacda50fe4b57738924f13a933f5307ff2c8c4015ecc030ae
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.26.tar.gz 11134336 BLAKE2B 61e543124c7b2566175f35d0eecb046ce2c69a7fe8102ccbc96f61c4bf700d0b78732e535e09f9056ee8c53ca2f11615bbf5788684a35b04116501d9dc4b4f68 SHA512 b4be713b3e3bdbdecb38d4b27f70e9a34630ea6e4f10beddf96ad1372e3d64aa2ee85b0774e871aefb4f9872b3dcdd3005fc3a7bded6be37d06157f3fe2861e3
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.28.tar.gz 11136237 BLAKE2B 66f09d39a60277358b08f073e3d5836bdb4acddfacc0c5321b19f876d4c5407ed1039b65e22e188690cb6c034aacca2be8d60a52acb8467a6c6319f46c15bb61 SHA512 7e352889469ad678e93d042a5a240820753918cd191c9e164678b84947fba5ae0616fda7f8e6385b2ba525e51948e4860ca91cdd62a2eb503f79acadcb367f2e
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
similarity index 86%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
index 54db34dd7a15..707f5fe35fdf 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit multilib
+EAPI=8
 
 MAIN_PV="$(ver_cut 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@@ -15,9 +13,9 @@ else
 	MY_PV="${MAIN_PV}"
 	DEP_PV="${MAIN_PV}"
 fi
-VBOX_BUILD_ID="$(ver_cut 4)"
+#VBOX_BUILD_ID="$(ver_cut 4)"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
 
 DESCRIPTION="PUEL extensions for VirtualBox"
 HOMEPAGE="https://www.virtualbox.org/"
@@ -26,7 +24,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 097a2ef816dd..8868ea6068ce 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,5 +1,4 @@
-DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
-DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd74a8ecbd312b6f9ee05b186577b675efd02b0f66293f7486a3a44cb9619e720f7a4012761ad98907496546fe9be362541f SHA512 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
+DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bfc11f3625d54629e6768da9040297cea999c53873c94437f2a57b245e71db0e28bd2ad94ed557f8a1c1c674f477301e192 SHA512 d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild
deleted file mode 100644
index 08e344b84659..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 ~x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" emake \
-	VBOX_BUILD_PUBLISHER=_Gentoo \
-	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-	TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
similarity index 99%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
index 87c84047ba44..50023a853b94 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index b3a69ad07cf1..dc77204e33a8 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,4 @@
 DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c745a72329065df2cc22918d03edefdf546d8e4ff0a36404ce98f1012faaacc301cd2c507b055db69b9125f91ad87fa5fde14d3abe0 SHA512 b50d7699db8909ea4e9126715152336a2c46e06f9fc24b5ef0624e7d26de1c83b2a57b0387dab0a46a9e50f9906126cfdcae4f290599de88a980adaff7fba180
 DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce00e416fa3822cbec3f00691651acd53b7c7bda8b43d3669195cececa83f1fc50a792e417adcd709d859497da143c4d93a2b414912 SHA512 220d57ab33a41464cd9e506d38390e60b9e67ca8262b1a13732f3d40820e038365c129eb7144f1932b8c2d3fdcea828de3070dd927788015301bf4aa59c1cc48
 DIST vbox-kernel-module-src-6.1.26.tar.xz 674624 BLAKE2B e38fdbb63e309463a526c4f6607f0cf6193109a9cd9ac4ac4cd752e614ce1594612dd76da7fda9d9453cbc45e9d3aa2989f370d8900f080e604ef1a903d8a736 SHA512 0755a802ae901664d3ef1481ffc8987a0f94d8be1d95c1969f370e2fe6eb479aba1da38d2206eb8191c05d3b7da4cf3d16e4e53d40fcb3f758622030a8864c98
+DIST vbox-kernel-module-src-6.1.28.tar.xz 674924 BLAKE2B 4a262a1609df493df8ba5b78d2daa225aed41fe51d54648633393dcb24ec648ae95f2fcb003f9a7ceb1a2a2ea99bc113d54db6621523ddfc3819e729c46f42c8 SHA512 b0fc1a1a821c93aa7dadd3a064d87938d31cf6ce37ab55d960fba104df4f28ab48797dc254e246af7bf1d5df913a9f329035941555fc9f165f02abea4448f684
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
new file mode 100644
index 000000000000..468a1ffeef51
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 01a2827067d1..8868ea6068ce 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,4 +1,4 @@
-DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd74a8ecbd312b6f9ee05b186577b675efd02b0f66293f7486a3a44cb9619e720f7a4012761ad98907496546fe9be362541f SHA512 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
+DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bfc11f3625d54629e6768da9040297cea999c53873c94437f2a57b245e71db0e28bd2ad94ed557f8a1c1c674f477301e192 SHA512 d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-6.1.22.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.28.ebuild
index 8e2979cd1985..9f8660a127bb 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PN="VirtualBox"
@@ -20,10 +20,10 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
-CDEPEND="
+COMMON_DEPEND="
 	${PYTHON_DEPS}
 	!app-emulation/virtualbox-bin
 	acct-group/vboxusers
@@ -61,7 +61,7 @@ CDEPEND="
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
 "
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? (
 		x11-libs/libXinerama
@@ -93,7 +93,7 @@ BDEPEND="
 	java? ( >=virtual/jdk-1.8 )
 "
 RDEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.6 )
 "
 
@@ -211,6 +211,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" #805365
+
 	eapply "${WORKDIR}/patches"
 
 	default
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 081391d45c57..d7ffa4f1fbb4 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,13 +1,11 @@
 DIST OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
+DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c
+DIST edk2-a3741780fe3535e19e02efa869a7cac481891129.tar.gz 12886279 BLAKE2B 2054bb84375b9840b31276f86786ea764368da200087e45c0528f2ca6b17aa9078a05e406bafa41c25cd65971ff007dfa19ffe91f9a5a2ab6c845bc6f62df3de SHA512 ca0543fefeb1fdc8d0d9841de309ce40fe88220463569a77f56d3fe3184fd4a57ce00b3c96c0861a51b7dbf5f4a9f9946b960a636593682f380c861f2606d190
 DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
-DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
 DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16
-DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb SHA512 a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
-DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
new file mode 100644
index 000000000000..c30cb328460d
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
@@ -0,0 +1,33 @@
+diff --git a/c/dec/decode.c b/c/dec/decode.c
+index ae5a3d3f..7eee9688 100644
+--- a/c/dec/decode.c
++++ b/c/dec/decode.c
+@@ -2033,8 +2033,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
+ }
+ 
+ BrotliDecoderResult BrotliDecoderDecompress(
+-    size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
+-    uint8_t* decoded_buffer) {
++    size_t encoded_size,
++    const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)],
++    size_t* decoded_size,
++    uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) {
+   BrotliDecoderState s;
+   BrotliDecoderResult result;
+   size_t total_out = 0;
+diff --git a/c/enc/encode.c b/c/enc/encode.c
+index 8d90937b..0c49c641 100644
+--- a/c/enc/encode.c
++++ b/c/enc/encode.c
+@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream(
+ 
+ BROTLI_BOOL BrotliEncoderCompress(
+     int quality, int lgwin, BrotliEncoderMode mode, size_t input_size,
+-    const uint8_t* input_buffer, size_t* encoded_size,
+-    uint8_t* encoded_buffer) {
++    const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)],
++    size_t* encoded_size,
++    uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) {
+   BrotliEncoderState* s;
+   size_t out_size = *encoded_size;
+   const uint8_t* input_start = input_buffer;
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
new file mode 100644
index 000000000000..a1f8d155434e
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
@@ -0,0 +1,26 @@
+diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
+index ad556710802e..4be7957138a5 100755
+--- a/BaseTools/Source/Python/Common/Misc.py
++++ b/BaseTools/Source/Python/Common/Misc.py
+@@ -1635,7 +1635,7 @@ def __init__(self, PeFile):
+         ByteArray = array.array('B')
+         ByteArray.fromfile(PeObject, 4)
+         # PE signature should be 'PE\0\0'
+-        if ByteArray.tostring() != b'PE\0\0':
++        if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]:
+             self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
+             return
+ 
+diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+index b2895f7e5c63..883c2356e0ca 100644
+--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
++++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+@@ -152,7 +152,7 @@ def encode(self, input, errors='strict'):
+ 
+ TheUcs2Codec = Ucs2Codec()
+ def Ucs2Search(name):
+-    if name == 'ucs-2':
++    if name in ['ucs-2', 'ucs_2']:
+         return codecs.CodecInfo(
+             name=name,
+             encode=TheUcs2Codec.encode,
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 16f1b5da5c72..fb98e4a01835 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -15,7 +15,6 @@
 	</maintainer>
 	<use>
 		<flag name="api">Build the C libxenapi bindings</flag>
-		<flag name="flask">Enable the Flask XSM module from NSA</flag>
 		<flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
 		<flag name="ipxe">Enable ipxe support</flag>
 		<flag name="ovmf">Enable support to boot UEFI guest vm, needed by hvm</flag>
diff --git a/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild
deleted file mode 100644
index c2b251d44cdc..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.14.2-r1.ebuild
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=23
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	dev-lang/perl
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${WORKDIR}/patches-gentoo/xen-tools-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-golang \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
deleted file mode 100644
index fd9eb3bf75c4..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.15.0-r2.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=23
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	dev-lang/perl
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-fix-xenstat-python-bindings.patch" )
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${WORKDIR}/patches-gentoo/${P}-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-golang \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.15.1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.1-r1.ebuild
similarity index 96%
rename from app-emulation/xen-tools/xen-tools-4.15.1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.15.1-r1.ebuild
index 45c217b88f1d..14a3eb3c222f 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.1-r1.ebuild
@@ -27,8 +27,8 @@ else
 	OVMF_VER=
 
 	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
+	EDK2_COMMIT="a3741780fe3535e19e02efa869a7cac481891129"
+	EDK2_OPENSSL_VERSION="1_1_1j"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
 	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
 	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
@@ -284,6 +284,19 @@ src_prepare() {
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
 		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-edk2-python3.9.patch"
+		popd > /dev/null
 	fi
 
 	# ipxe
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 5c2893094f36..715314e8899a 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,6 +1,4 @@
-DIST xen-4.14.2-upstream-patches-0.tar.xz 23304 BLAKE2B 954e0a49e5c3ec122aefe52afe328f440b8a4c8db966e0fa91e0b6d6cb3c0462b75fb99b3e7392811bd2e680cd7945e8a4d68317245fd42fdf0ad6cab33fbc68 SHA512 64d243f0c8acfec87812e4d78e3d8b24a86315824853f4f3b17122b7119425d180650695bc12e1a30f5b30c6ef684be7c08b2bc677ca2f0668d0335d92e2bf78
-DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
+DIST xen-4.14.3-upstream-patches-0.tar.xz 3532 BLAKE2B b3e1530a9e14bb1481296f3a878cceb81f1979b1cfb9105d4d1b03681a3449c40cabd1807109acfb3742fd8085c28094c29889d22dab5a99c9bf22443d1e848e SHA512 d6b39830bff83da745279041d144d56c3b153beae09e96fa878397f388575d106509816d710e94fa79dd60a874087921eba98e1316877f6ef4591a12f05846ee
 DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16
-DIST xen-4.15.0-upstream-patches-1.tar.xz 35180 BLAKE2B eb3b2a44b717a04daa4a2f158040cce78b42cba5a72c437d7b2f8f1237b808f6f13c2140d82e95056818db6c0eb706ebd7dead822a6a4e689e5d5e7c83523fdb SHA512 a7cfe2dbc82b15c48fa781a77b3ca1622fc2feac3874bf17cf56e82be46e9817913f94992e0e1a1cd2be2e719d4abb9a15744c8a1017e30c0d5c01d7db64dbb5
-DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
+DIST xen-4.15.1-upstream-patches-0.tar.xz 3532 BLAKE2B 797f6c4ce44b43c9b43ee27718dc6d0b234588df2148961f8b078b3362b23bec6c2326eb0584255b0f3128c2f8b673ac6b9590596119c5fec82e7b03a1305b2c SHA512 c7d1a21042a3003eb9d968b3eb00aabbbc5c145b8b05fdd9e520cde34d1643d7f4f8f7039f30843a65439b1d40584c751e31ead620b88332d50b10f14fe81c0d
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
diff --git a/app-emulation/xen/xen-4.14.2-r1.ebuild b/app-emulation/xen/xen-4.14.3-r1.ebuild
similarity index 95%
rename from app-emulation/xen/xen-4.14.2-r1.ebuild
rename to app-emulation/xen/xen-4.14.3-r1.ebuild
index 180a6f76adba..5c85c91a72d3 100644
--- a/app-emulation/xen/xen-4.14.2-r1.ebuild
+++ b/app-emulation/xen/xen-4.14.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
+	KEYWORDS="~amd64 ~arm -x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
@@ -41,7 +41,8 @@ IUSE="debug efi flask"
 
 DEPEND="${PYTHON_DEPS}
 	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
+	!efi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
 RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
@@ -70,11 +71,6 @@ pkg_setup() {
 			die "Unsupported architecture!"
 		fi
 	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
 }
 
 src_prepare() {
@@ -101,6 +97,9 @@ src_prepare() {
 	# Symlinks do not work on fat32 volumes
 	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
 
+	# Enable XSM-FLASK
+	use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
+
 	# Workaround new gcc-11 options
 	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
 
@@ -117,7 +116,6 @@ src_prepare() {
 
 src_configure() {
 	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
 	use debug && myopt="${myopt} debug=y"
 
 	# remove flags
diff --git a/app-emulation/xen/xen-4.15.0-r1.ebuild b/app-emulation/xen/xen-4.15.0-r1.ebuild
deleted file mode 100644
index 7b6e9f60c2a7..000000000000
--- a/app-emulation/xen/xen-4.15.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	# Symlinks do not work on fat32 volumes
-	eapply "${FILESDIR}"/${PN}-4.15-efi.patch
-
-	# Workaround new gcc-11 options
-	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.15.1.ebuild b/app-emulation/xen/xen-4.15.1-r1.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.15.1.ebuild
rename to app-emulation/xen/xen-4.15.1-r1.ebuild
index ddd079776931..b49ac4f28ca3 100644
--- a/app-emulation/xen/xen-4.15.1.ebuild
+++ b/app-emulation/xen/xen-4.15.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index b76fc9e133bd..efa145f1eb9b 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 105124d7af34..45b735f1b8ce 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,2 +1 @@
-DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
deleted file mode 100644
index 8c38721ea651..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index e8b64f68faad..a2c9a9f929a9 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
similarity index 92%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
index 60292db609e9..3c0b95dc64fc 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
similarity index 92%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
index 4e8cb0ffc7f7..c4ae2d6d9037 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
@@ -32,6 +32,12 @@ RDEPEND="${DEPEND}
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_schemas_savelist
diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml
index 491c88b3a31f..293189c63481 100644
--- a/app-i18n/ibus-typing-booster/metadata.xml
+++ b/app-i18n/ibus-typing-booster/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mike-fabian/ibus-typing-booster</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6821da673b36..5959a329c806 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/uptimed/uptimed-0.4.4.ebuild b/app-misc/uptimed/uptimed-0.4.4.ebuild
index 7375c25fd9ce..c17b13c2d032 100644
--- a/app-misc/uptimed/uptimed-0.4.4.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	acct-group/uptimed
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e79cb1f9e2bd..13424ba15468 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6bdcc0767c20..c4e41390ab87 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,8 @@
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
+DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a837107df0404af036a48e5baa23fccfc945a97fe328a80b15c7357fc71acb82721d4b96e5f726d8c9d836fee031916aef7 SHA512 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
+DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index c5e6900b4f22..d112d0051958 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0.ebuild
new file mode 100644
index 000000000000..b79047df1125
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.55-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	unicode? ( net-dns/libidn:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		$(use_enable jpeg2k openjpeg) \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 5302f784c9b1..4ab7efae2ee1 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/mongodb-4.2.15-r1.ebuild b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
index 3002335b9c77..4877cf52d7b1 100644
--- a/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
index dc16e9d2e44c..8429beb08e60 100644
--- a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 -riscv"
+KEYWORDS="amd64 ~arm64 -riscv"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 24032b65fcbc..9a696cf3cee5 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index cf101c469d45..d528909e6388 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,30 +2,20 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
 DIST Python-3.10.0.tar.xz 18726176 BLAKE2B 77143edf733cadf7e52327a58782f0617b1dd0d132cf58e0f26d37a454bb97f82e7931118a6a71f22779d9b6ec4efca974c43c19a6338b4b24a9fd616b60cc89 SHA512 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd
 DIST Python-3.10.0.tar.xz.asc 833 BLAKE2B 295df19932ea076bb1a50acb38782055ff34fb235df0380fa361727eedb3ca68aeca2a31419de5b05ce128c2e21ad04605c226e7a61d508a17607f615e46e570 SHA512 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d
-DIST Python-3.10.0rc2.tar.xz 18737220 BLAKE2B bcbddfa718b66b30b85dc3afad59eb3d977bfe036564821d5016d7150a38c377bc6fb29c611dd28681b660e488f0ef3d1de21a6cd9528866a3e86e8afbf589af SHA512 8511d837e465818a7b41df4593f29179e4d420171a287deb484ab6834fe17fe6b9d49ea6ee619573c8fa02aae0bf11807b5fa5903b200e311a0ba27981ecdc04
-DIST Python-3.10.0rc2.tar.xz.asc 833 BLAKE2B d518871f35126be04effc213cd78b9fe641c75ffa361671f111916cff0dcf9578cb0010842afb5b25037cbff494023db8b28e7fcf0d59a53667ed59d7f4f661b SHA512 ce38167956314b27641f08fd5cad67bcf286154ff3a74a8987e9cda8b5737ed2218f0190726c7555cc5f49d76dee3d90521512e4560bfb4e91789217e36ee096
 DIST Python-3.6.14.tar.xz 17218148 BLAKE2B efe655cb907ffa678ca135f88ba9d867e523969ad82dbc09ffb6d8d383824a4b43c525e156a3c35484a526b4b3ea755109e5ef15d17852d44e3351c307fc5e91 SHA512 15b82b7285db97cb27a6fcd57ce9e258fdf8dbdb2f00e22e4331161b8557c8244342546c4143e84c72730759e0276770396b6ca5bb7cf87310cca8e175423006
 DIST Python-3.6.14.tar.xz.asc 833 BLAKE2B 81c79dca5728b21b8c2badcaa1242836f1cf13984bb755463cfe9e4fd96a02ebf31f1a9239759a937c6d6a04c18bfc682a82cb0ab2e5a473de153423a7248c9c SHA512 600bf504f2c0d3ce7d1e8e953b4f27a7a7c996b7b9cd70efb876178fa5424130bff5414d5ac7deb8b45103ed417fd40d830613db39750d35a0c967c8fdfea50d
 DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef
 DIST Python-3.6.15.tar.xz.asc 833 BLAKE2B c910f2367ed947ff6b33380bf8fee318c65d6e5fb0c4a847fd8f2761bbae81dec07b729b31eca060916264b6a0ccf5c52ca72181b3db79751df7697a426a8939 SHA512 cdc93e5d8fb2b5b48a1560a55bba4680adea10e35c8c38b4c51cfd2f6ba54ab2a5d4e5f71b78b889f98cf8ad9d598e0f4e019d50cc16f7db57f9d292a860fcfd
-DIST Python-3.7.11.tar.xz 17393380 BLAKE2B 6394d69935950366da7c4cecd4816d76254170d5313adeb4de9edddae13bda7dea373308517c2abe00cb7eeea8eb428619124feed8df858f9bb904bd423e96d6 SHA512 b8d8c6958444ee9bdd59f0804f7e61d9657c0805c7c58c3352d1c1efb33ba2be8d3485cd2656a2b2b99618a439879687a918f57dfdd125e989af637043600a59
-DIST Python-3.7.11.tar.xz.asc 833 BLAKE2B 8af6b3e58b607a34c91f57af2fbe9c3f3c7cb6fa5e435e963edd7edcf7649e70c3a76bd346ff8ef1b3c890d8a92d3b2fed27ee01b512c579ff8ce80be61274fb SHA512 f19db95e88c9269174a2b4ac4d8c68fa7ed666b6698af26d2da202e30d145686e8679be763eecba9f8a0c34a207639724094463cffce659c3855ed4b133b0a59
 DIST Python-3.7.12.tar.xz 17401916 BLAKE2B f01b5cc54cd0ffe2e8756767c624dda8d2fbf24e90f22a16b5a406dad995ef218613db10f0b3fb2da0ece50ccb02c8a8e007ceb0842ce9e93ee9df7348ef1528 SHA512 e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a
 DIST Python-3.7.12.tar.xz.asc 833 BLAKE2B 587fcf019f4b07b811834d7279b9861eb709731a431be9cbe8f5b868ac72b6d9a4de8b24e3fefd6b339813299514a0ac12b5f627acd04c185ff8dea22a044723 SHA512 a47003dd5c784eca4e3c34dc8705d1171043e060f3a97e4dd63ce4aec2bceac56d7e808924d63b2a38f9a020bf799cf29e5055fb444b9b2c3f03976d47122355
 DIST Python-3.8.12.tar.xz 18443568 BLAKE2B 73413aee7a31347ac4342718a54d23d4036220262c4cd41cd50b06c3b1698d52d11cf7ac2c781b919f2cdb0dcb6397d623c463dcdcd1edca99abbbce239a3c6e SHA512 2f93fe5ff83f470c7b6a1b7f29f499a2a010fabd649e9fe65ad3fbfa21b6e1966e77c9b7ac012d978159bc3fe63fec2d64bc6982fc2ee1714d3fa0e47631f279
 DIST Python-3.8.12.tar.xz.asc 833 BLAKE2B 33f59aa667555832ee510d2a7295079f34a3983dfa84beab20b33ec691ea3eecfcc4a62591fe233fc30622d0236ee69a3d41b8922ee2f4c632df3523d565c3ec SHA512 ef552b716a721f410abb14387594c8b0ddc65ce4b8a6ae6bf920c1db2ea9ddf6bbf547e93d3716495ae31848eb1049aae4257016e888393681bbfb6f6529bc12
-DIST Python-3.9.6.tar.xz 19051972 BLAKE2B 0d8586b2935088eeab7138cf2210c1a74f1bf7359359d25750af5f69de55eb39c92f518b887a8b749c772ed7d33e85b912928ae6d878514eb58d85ef210f54f0 SHA512 01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1
-DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B 41901bfb80a901f2f14e86769e6d08ded8f75656d347201345183162e180e61442da871a1067572a54da579551166a19bf5436e51581bb10cb78afc4d28773fc SHA512 0673c8833f302c829bfde97453c52744f6aa99b4a72520f4cc384d4aa9d6ffd28a1407ceafb0a1ec4462b3aa74b656bf39c67872c4e6a131429ea58c47ad0ecc
 DIST Python-3.9.7.tar.xz 19123232 BLAKE2B 69dfba6974c8c74de1b71977d28cad4d7c26615695f48a99444d2eb83d657b4bd8d22e7f6e94b1b2dcbcc5605c0aee08c609b9564e306f48588e2a7f471209b2 SHA512 55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735
 DIST Python-3.9.7.tar.xz.asc 833 BLAKE2B 2d9c47e47d9a625e393a8b456dd5b10dd485fc13ca7c236b5fd304c373879bea8ab3c67ff99c3a81350443f6ccba20718466a221a05faada6b82cfe92943fdbf SHA512 7ff9f845f520efab3b4a0e95da3ffe055ee5777a4173a5b2cc1fd2419dc2b4faf30d1e711e372df36e34bc971ecfcde88a7cd815cfe2d8080ccb575a1ae8e101
 DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
-DIST python-gentoo-patches-3.10.0rc2.tar.xz 8488 BLAKE2B d7c1e45e63bf5bfe5d41823ea183608f4bcb44694feb18ee6d315250f1563684ce87dec29f46c16da223b6bbd1d20e75791d347ae6ac1d4b5130ba3f08c55ca1 SHA512 c2ca3b60f33131b20037fc0f53a5ce655e9978c5fa42d0b8e2c6b56aec24f6f37d8997fa146a446e5fd72b5d2c4b017d5e4fb71318a51dbb45f5d3b0ea4ed4ad
 DIST python-gentoo-patches-3.6.14_p1.tar.xz 16576 BLAKE2B 902a9073e6d3e40cfba105680d9947b64a4bfa1632381bc71afbd2691350dccb36f498bf17ac7dfc8ce331dfc3fb7e3cdd539cea3f5e9db1c49210ad4d124182 SHA512 4aa354f1ca8d9bb3c30b666ef61cac8380741342102aeb9ea77cc06ae62179f595acc1c2e6321e9c2395abbc3fbc649ecc93b80443d139859924524989539992
 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
-DIST python-gentoo-patches-3.7.11_p1.tar.xz 18540 BLAKE2B 717f3b279368faa355e9b306ede5aa3cf750b7a862e50553caf4efe19b6b8d40431974fbb510414291c4c91623addebff54fd6d4f7f7553c686c5382174bc81f SHA512 e403d2364bbe600d7c3dba8f70157b1f243b00848e3826e6f350d7dbbdd0966229fbf9aa11e0e87fb5ab93b8ea69893f389e5b92c22d7315f99657d69695ded2
 DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
-DIST python-gentoo-patches-3.8.12.tar.xz 14936 BLAKE2B 1cb6cdb0bb659b1bc3f8a4ecd80da74b41a9fa2f4d5646ac4b48ddecd5124677cb24574a425404fedab4fb9c7faba4b1cb54cc3482785559a54fa3e9b3ca13f1 SHA512 86c30622bbf6847efcdf2bc43d916b05ee78ab17f45b93148a01cf4c181592029ecc52e8c4887112d97aeece63a92ee0f685a689287c133443cf51b3f8171fb9
 DIST python-gentoo-patches-3.8.12_p1.tar.xz 16632 BLAKE2B cce7a41d020af1ffc55a01ef67b20bcb16c68adbccc1e44ef166d1707e817ed6c3bae70f84c56553f27bca449015e273014c0be73bc2f9b4e25844ddce385486 SHA512 4621727c2e9cc1c5519e021210e16a97e7167ea831445dfdd07f5b0ed642b5919834244111708a971ce098b10b439797e1c76827eccab803f801052c671f1ae6
-DIST python-gentoo-patches-3.9.6_p2.tar.xz 14720 BLAKE2B e14634229b65a29f5294694949c138bfa6146810349d1207a07d84eeca529571eb9c760b58ddbe6e8d96d50d1a3e0d1dfe42328c53c977a9eeb22ecd553317dc SHA512 5d84b8bb4e5584e3ef8e6298af000e772240ad93ed0aaadf1d785db947f1e79aecae7313b8dbeb65849212c9930e683be6e18e42ef6c41a3c27d60f75df08a01
 DIST python-gentoo-patches-3.9.7_p1.tar.xz 14444 BLAKE2B c976beb1205b0b777ff3375f538758bf28443bcf4c953fe161545791763da043e32582c398ec8151478afc40e53f963e080d29420066305c12963c953887e4b8 SHA512 283c8975885f9306e46a0047219f3a70e1000f3401affb0b55cde976be6fb6df2f1c13f4e05a479e72e0731d683fef9b22413f7cd320298295a31b19c8915b3d
diff --git a/dev-lang/python/python-3.10.0_rc2.ebuild b/dev-lang/python/python-3.10.0_rc2.ebuild
deleted file mode 100644
index 871bbbb0eba6..000000000000
--- a/dev-lang/python/python-3.10.0_rc2.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-	!!<sys-apps/sandbox-2.21"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.10/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.6.15.ebuild b/dev-lang/python/python-3.6.15.ebuild
index 54ae5943f023..c2cf642a4a84 100644
--- a/dev-lang/python/python-3.6.15.ebuild
+++ b/dev-lang/python/python-3.6.15.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.11_p1.ebuild b/dev-lang/python/python-3.7.11_p1.ebuild
deleted file mode 100644
index 84d00b68ff84..000000000000
--- a/dev-lang/python/python-3.7.11_p1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_P="Python-${PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.12.ebuild b/dev-lang/python/python-3.8.12.ebuild
deleted file mode 100644
index b6e8bbaeae44..000000000000
--- a/dev-lang/python/python-3.8.12.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.6_p2.ebuild b/dev-lang/python/python-3.9.6_p2.ebuild
deleted file mode 100644
index 6e4e3ef1158d..000000000000
--- a/dev-lang/python/python-3.9.6_p2.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 47d77e1829fa..6b6f64bd7bfd 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
similarity index 95%
rename from dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
rename to dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
index 635ce69ed4a1..6626d0895985 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
@@ -82,10 +82,14 @@ mymake() {
 		LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \
 		INCPATH="${ESYSROOT}/usr/include" \
 		IGNORE_SPEED=1 \
+		PREFIX="${EPREFIX}/usr" \
 		"${@}"
 }
 
 src_compile() {
+	# Replace hard-coded libdir=${exec_prefix}/lib.
+	sed -i -e "/libdir=/s:/lib:/$(get_libdir):" libtomcrypt.pc.in || die
+
 	mymake -f makefile.shared library
 }
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 252079f58c05..9d306c4a56f0 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index 4c7a9470da50..e757ef8332b3 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index d7592ebf551d..33347b97f969 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
index 9879673613b9..7a72feb4e8f7 100644
--- a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
+++ b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Less indentation and newlines plus sub deparsing"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Data-Dumper
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 2f38fd4ca321..ff0738299439 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
index cf0e6578eb6f..44a146edd01c 100644
--- a/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
+++ b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
@@ -17,7 +17,8 @@ RDEPEND="
 	dev-perl/Moo
 	dev-perl/MooX-Types-MooseLike
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-perl/Module-Build-0.420.0
 	test? (
 		virtual/perl-Test-Simple
diff --git a/dev-perl/SQL-Abstract/SQL-Abstract-2.0.1.ebuild b/dev-perl/SQL-Abstract/SQL-Abstract-2.0.1.ebuild
index ed5b49640308..a84a9dfb1ab8 100644
--- a/dev-perl/SQL-Abstract/SQL-Abstract-2.0.1.ebuild
+++ b/dev-perl/SQL-Abstract/SQL-Abstract-2.0.1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generate SQL from Perl data structures"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-python/Faker/Faker-9.5.0.ebuild b/dev-python/Faker/Faker-9.5.0.ebuild
new file mode 100644
index 000000000000..12e618b6e887
--- /dev/null
+++ b/dev-python/Faker/Faker-9.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 68175ef85f8e..9cc2ad781d2c 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1 +1,2 @@
 DIST Faker-9.3.1.tar.gz 1169930 BLAKE2B 464f092a5014ebfe2d6c1a83f8d30f13507835a35e8307a22accdd6da92dae02a541ae2f686d724686855ded7b7e0f3c1f3922de0040e22478d9b55b2833b84f SHA512 e7468b4d91b47ad22d300a37dfa21b91f354b46f845854a9fe8b40da61624dafea5fca4f519939fcc16a84e9d9d9f33f715dabf4e231b9950b4a5b3a37cfacd0
+DIST Faker-9.5.0.tar.gz 1176231 BLAKE2B 5b1fbdec6952ee18c4f7243e1776cc5b44b99b2120f9fe7dcf3ad6a633b46644645e5f836456a969b4861ab672f59ac4b14268bee55b0168a8cddbe96774f481 SHA512 a42a26583432f85466e5791a98ae91e168e2a3bbb04cc1fcd90c9c5d76d1d9e4de709852b832e1ebac01c365e7a6598e707cbf7c36799f97f080cb0ce3f60cdd
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 64e11a3edece..20eddcd1b30f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 52d060705d36..c5971acfbb6f 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,2 +1,3 @@
 DIST aesara-rel-2.2.1.tar.gz 8166022 BLAKE2B af3c17029dacb3d365bf49eb01d4d03b5a4f770f66d3e5eba2c4576ef156056bc1aca3571442c1cb7352c358978b47faa7af70ca0da2a2168d8c9bfd47b17138 SHA512 f7bab8ca80e8d13ef7698c1efa56ff37c561786330bf756c7a00c54ae1f131810d68bfd6e328b0705d45788759bd984d42306d2c545d2de6b9a3592b5c021ad8
 DIST aesara-rel-2.2.2.tar.gz 8174668 BLAKE2B c95347e8b74f6600c3570177f86b7ebd7511899ed0ceb24a2d79a03a44ee498a8062b92fb79867f59b609f66315704ee92e28e12a5ab600d54d0d35ef799b66b SHA512 d5f62e42c36100b2fd25eba492590eb306b1394aa01bf2e90d43e84ac67701e5b756be6bc08d0e6b82fb1f37689dbbba1d7ef67c8525555a700a634d742056bb
+DIST aesara-rel-2.2.3.tar.gz 8179701 BLAKE2B 53ef58d6f0ab33e7efe3d0eaa2b55153a2ab29c958b48f52f814fecf7f5fa65424465470cde0ebb8d2ef1ced6968fd01217d9f7bd61acc8843cde1a9c0a94cbe SHA512 21414230c0be2c31e08fd371ee69c3bb7098b2134a5aec006abeca00a333e025fcbfd10ebdcbf54d243e1bc8c45f301a2c3443531ba5eaf0fe3a1ac5645ae4f5
diff --git a/dev-python/aesara/aesara-2.2.3.ebuild b/dev-python/aesara/aesara-2.2.3.ebuild
new file mode 100644
index 000000000000..86721797fe0f
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 13990f84a82a..96014e1c654a 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1 +1,2 @@
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
+DIST backrefs-5.1.tar.gz 5216647 BLAKE2B 060d153f0d5d674e7b2e6f744a9b283d10f9f47fb355fe5d5703cd83b2507852d606d51cdefcf37617ee12f7bc71d487bc50254763415c02422524da9d71aae6 SHA512 b5123e46f0bf2108060c7e4f350538159c08ee7fe3b07bbed44aaadc0481047262af80b7bf08066db423a86b4e8660a91c9e03ea41a7bb039c3d17ae3faa81fd
diff --git a/dev-python/backrefs/backrefs-5.1.ebuild b/dev-python/backrefs/backrefs-5.1.ebuild
new file mode 100644
index 000000000000..b0b83486bfeb
--- /dev/null
+++ b/dev-python/backrefs/backrefs-5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs/
+	https://pypi.org/project/backrefs/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 992322dd6009..df77045b7af1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.18.61.tar.gz 428681 BLAKE2B 54aa44e4c1756172b5feada7c32a52d32a7938f
 DIST boto3-1.18.62.tar.gz 428868 BLAKE2B cb3d5cf5a0b2a15e5d881ce262d9dede08aa56a99cc2f470befb15063395ca761c8715b1b1e853626ae42d6f136c74dd65fe8abe8f1fdf00dca48ac601f1ce0d SHA512 265707cfd9529fc4300c744dbd17a823b32593b8bd1e26ccde5b6e80d7fea61c60b0d0d5e6f3d6606b3c4870c608283b7adddace2d4975367c7e1e4a1d10e003
 DIST boto3-1.18.63.tar.gz 429243 BLAKE2B 67b61ebe0d5a7c4d83922a3ec110e5d4e33c705e2a38031f218d2e059b1f8d9428d7307f0b5a581a60ef23068793e61cf6597827ffbb2a8714aed1e0716ac361 SHA512 d8f83d9edd730d40063f2cda759ad527d811c3f4bc7a8c450c3d426c7842e35481ae138e53dca2ce6ab4a30d06610f454c31a0d3259d56fe553f5b6d1ad58db7
 DIST boto3-1.18.64.tar.gz 429469 BLAKE2B c0e423871631017ef9aa5f1e89ada9c82c4c81762f724f7919005cca7078cfb008fd489cf1498a3011b2de0a4b0ac8da1ab0a5aeb8cd54667f4607d8e9fa1168 SHA512 1d56868fb8d6699aa118d1296ae9535d08143329e1df5281b29f6e4b9b7452846d3988ffb6fb66eace93e605e6bac9e04cf2e67f0a25b2b90dde27b02212587a
+DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c908318c507a7cde1eef0c36d8fe3a5d3be0f8c6178edfdd8bc82adf112f297a5f127cd2b442ce10fe4d37b3a21fa4 SHA512 631d8f618fb6d55b338b563e72e1ccc751b8937bb2660d033b885951ea5ec3ac6902f8c7b9918664d764be84fdef5af4e7a87d444cbc154ebf5ae06908f90714
diff --git a/dev-python/boto3/boto3-1.18.65.ebuild b/dev-python/boto3/boto3-1.18.65.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.65.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1939cc82bed6..8ea2479892e5 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.21.61.tar.gz 8255275 BLAKE2B 53f5e6c3af455bd92f59152d28ed7a598c1
 DIST botocore-1.21.62.tar.gz 8256122 BLAKE2B cf51c1aa4890dd3deb9da8b4c51b89cd4c006ec604d7728304938833c156450829693daa563f59a09f066428348f70f5d8b94172341ac30be072443f6330b612 SHA512 c34e512d1ebc60e7c37d3fb6856e43affbfc77cc21c971547725277df5325d8ae20acbf00fe2e89fc2c564d8a911a6a0db913c9ab6bd769e38596f2d8eba36b4
 DIST botocore-1.21.63.tar.gz 8256427 BLAKE2B 7b6a4d29005cdf127881a88b51ffb3162698df011d7345137537666e92a01a00e44c0fc7edc8ec4c17d3d30ddc5ae801b253b0704e70c37f6de1979cd2fe86fb SHA512 e67b56d3549bd70101f322da04eacca261c2afe9cd2c065ac290b4266fed5342cb8f15a2edc144006c5dc91692a95ac49d9d2fde86db4014511bdc3bd95d9193
 DIST botocore-1.21.64.tar.gz 8258628 BLAKE2B 5a335085224ed86eb2364a67198f1fe8d745102e38ed3cab47821d5bd03c6163ccd7754fc2201384d16d28c9aaf2c0ad447f97374e1b6414739688c788b3b122 SHA512 f40aca854103d97f8d36d178cd5a8fc19e1bde63476c570ae357f2526a82054c3e26a4db26a996df23d66a09bb4ef9354372010b726499cce0021d2dd48c7bb6
+DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e07ee4348e730e6b4d11285f3030f676f0efda58a72dd92cac8c6ba0cb57f8f879eb5298009ecbd227904d18a453bf SHA512 955d24d2d486524af7bee57a56e2e903458030420198f3e6ab49d61be52b812a98444a9d0f86503b121270d6642345ffad6053ad143374dc56ab908b385afb0a
diff --git a/dev-python/botocore/botocore-1.21.65.ebuild b/dev-python/botocore/botocore-1.21.65.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.65.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 6e0cb8ac9e7c..d099361d98db 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1 +1,2 @@
 DIST ghp-import-2.0.1.tar.gz 11158 BLAKE2B c091d193cbfd44d90e62fe843775412a74f7962228130ba381ca07f5af93ea2296e989cffd025fd7d6a50ae5e526afe69fb00f49a6780b9b2f49ee8f06e2d3e1 SHA512 8e53b1a516a8d9780159d57b3973ebe02bbc4f60788470ec823c99608c2b026f5c43a12796506adf039420f06964a11d9e7e318cf9ea10df167faddd8b6f9707
+DIST ghp-import-2.0.2.tar.gz 10928 BLAKE2B 7479917284af9a8f8ac460f43d97c9d5fe29c4dc3663698e5b76e9ba1b0a7cdcd8d93fb1f112cdcfaa6689f70f280b4dc49c6f8e632784c11121f1fede1f8eaf SHA512 554c466f1275d905d7698539fe74b662f43c26b9497e83bc3615849ba2815dcbce6ae01fa14eb1c2245987ccc1b497afe175e3e0ddef3de561fc14ea24792d4e
diff --git a/dev-python/ghp-import/ghp-import-2.0.2.ebuild b/dev-python/ghp-import/ghp-import-2.0.2.ebuild
new file mode 100644
index 000000000000..0e34126d336f
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-2.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/c-w/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index b1e54f06ec7e..9186931a6b52 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,3 +3,4 @@ DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5
 DIST google-api-python-client-2.24.0.tar.gz 27072085 BLAKE2B 285da09fff461ffd100a5fe603f970fab6d552197690279e0c0d411700b95109bde523c1cba84a3fbc04cdf7bc13237a4432014912e0c79aec0c1d82e42c8c69 SHA512 84f0e0f95de0bede13e76eac3885b2a40a61d3ad522cb11a59cd3ab1d7bf6a7368a21232f9a9f64905bfaa2bd7a9b359ee3dee2a53e1dc303e8aede14dbdd466
 DIST google-api-python-client-2.25.0.tar.gz 27073397 BLAKE2B 0bc1d2c75cf826cc3326406909ab874b7ac51fc823bf5367fd56abebdfba50c035d4b92e3a0d19b8cebd8d570742e9aa3bdc7745c139624e261bc89fba8c789d SHA512 7940408b1d6ec42e1a9cf5a3ecb20eb3d4c3b35d4b363237c6bed0f32a1fb4be0fda11a0c9039a6cc5cf28ba05d0f183ff7b7bb2f5cb3f1bdf071f328b851035
 DIST google-api-python-client-2.26.1.tar.gz 27174748 BLAKE2B f00b4be7b5f62e0067e588404485d854b876b7e829020d980088be62018698c6f6790db7170faedaa2f419fa3f645443aefc48aeee64883077901adbd62af9fc SHA512 cca0cf4b66fd676feedc8efb75e19379668fe567aa104d7305209da157faf8eb31f718d33fa62c25a44b6aaece4b1a105392163e3395f17b837002c347224f23
+DIST google-api-python-client-2.27.0.tar.gz 27434968 BLAKE2B 95575f70ec3a7cb71a252495c8daa74ee06fc5499c4b9febbb4f492db9d043e1a67d78bb7a5cafb64bf50697922b1b5f92cf8e5d023fab762cd4dc585507d139 SHA512 7486cb120ca726a7ba57e8629e6e369c49d1de4459986c1458d087fd1c01be2979ac0d30697d50adbb1ff67c0d262e68bb17c7f43e1148db62d04b7befe3af2f
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
new file mode 100644
index 000000000000..274177292963
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index bca64cf3ea7a..773ecc26f4bb 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1 +1,2 @@
 DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
+DIST greenstalk-2.0.0.gh.tar.gz 13280 BLAKE2B 510b84d7dd48e0f5c9fb46ec0158473623a9e4c570e1c72db45802fce7a61b99c8f15f87d6711fa7540e6e2b6d4a846194adc28e2696400c45dc6692747f41fb SHA512 4d338bccb09b7c17c0216ce9cc4c1c9c896d15327053adc248404140ded27df6969fc8f0807120ec9417676ead57395185fb9fc5d826f49a1a1ee473aabbb048
diff --git a/dev-python/greenstalk/greenstalk-2.0.0.ebuild b/dev-python/greenstalk/greenstalk-2.0.0.ebuild
new file mode 100644
index 000000000000..a73826cc5bbc
--- /dev/null
+++ b/dev-python/greenstalk/greenstalk-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python 3 client for the beanstalkd work queue"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
+SRC_URI="
+	https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( app-misc/beanstalkd )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 9f8020aad6d3..0ac076a08062 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 DIST jsonschema-4.0.1.tar.gz 290999 BLAKE2B d693a33ef705a401187bdf603aacfd0336eab16afc0e38c5133ff6a74e4f0b323172d5abac0959163e40f546eedb75fe2b71f2ca53e7bbe1bf4f00ad977873b9 SHA512 50a2dd6423e8aca76e0a33e33a63bb7d1500abac891076426112c4577277d1f0322d06ec0ba5a9f47c65e5981f0cce768801e55e2f03ab6b0b6d2f884249b5fb
 DIST jsonschema-4.1.0.tar.gz 306755 BLAKE2B a98f1050943543ac51a2e0a7242a8bab909805d660a21e13909748e847493fd7c1f513beb3dac1126e57ffd23bf6702bae52902a5ac6aa7ab94b39833fc40b0c SHA512 288c28d80dc3540386db8774783bbba67455cacd81232aa41e065a9b22fed85dc1bdddb955f8438735bef0f1eb2b2947ab07c66344adb486ef77b31b345f1182
+DIST jsonschema-4.1.1.tar.gz 310026 BLAKE2B c14bee88d20c53e4198e58b946c92a5c505a205daa09c30c474c2e95af45414b1c527298a2e0df647acd79ccbe9344c2aa03ee3e1b7daafda76153248e73f794 SHA512 7afa1bffd9631a503277479595cc9ed9a58ecd0f8f9035a2b65e4005f9f58ff4f6fa968b5ca783aa22c4530fc4acc5e2ea1ef2f67b7f4f09f245e9a6f2b2c3bd
diff --git a/dev-python/jsonschema/jsonschema-4.1.1.ebuild b/dev-python/jsonschema/jsonschema-4.1.1.ebuild
new file mode 100644
index 000000000000..904fc6ee1ce0
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+# formatter deps
+RDEPEND+="
+		dev-python/fqdn[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/isoduration[${PYTHON_USEDEP}]
+		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3987[${PYTHON_USEDEP}]
+		dev-python/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild b/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
index 19181a90f3b3..ef454e60acfa 100644
--- a/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
+++ b/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_REQ_USE="ncurses"
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="A flexible Python Kconfig implementation"
 HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
 SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P^}
 # pypi tarballs don't include tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${P/k/K}
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
@@ -28,9 +25,9 @@ python_prepare_all() {
 	mkdir Kconfiglib || die
 	ln -s ../tests Kconfiglib || die
 	# don't run kernel Kconfig compat tests
-	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
+	sed -e 's/run_compatibility_tests()$/#\0/' -i testsuite.py || die
 }
 
 python_test() {
-	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index ad34bc83bc36..697c6fb92b09 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
+DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5e2082fa7ec9d3f2eb07e2ee3ceb245ae1dbe81d461f59529fe2b821042a254b6d69a0838f01f470387bccca4a9a85179a3 SHA512 052245d69e7d19bdfa4db7e2d1d880cf49bd850ea79371cd222ecaab8964840e5b2b09bf4646f1a30f56b0161be6f3f163bcc81291ccbb0e6f47f7c24e741ab8
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
new file mode 100644
index 000000000000..fb51b5e59ba2
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index b255b8f94587..3ece867a1c82 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
+DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
new file mode 100644
index 000000000000..6cf17b42136a
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 387f97be7b34..905586879663 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-1.2.2.tar.gz 6919165 BLAKE2B eba8d585c3653640bd3babbba3a1fab6aa9dc3ee365536ee7b0956e38250611bab3180c6a7f08eefb1e1a3637d07a0f366179570a9bb69df4f02a605610a770f SHA512 6cb111fcb3167a39e1d282d24b5e67d806c3e7506f55ef11a227b37ceeaea950142db2bc1db3709caaa2813c62ef8c4ef74aeb26e62f4f10aeee528e0532eccd
+DIST mkdocs-1.2.3.tar.gz 6919177 BLAKE2B 43ff118149a497dd366f7132487564be51ffeaff644a519c7bf9e52a3e3239e9696c21616e5d7494f7c4af8ee60ec77f27fd15e80f5c5c6c1b2db4cf1f672e44 SHA512 03385bc940df8a6b3668300f3752afe973b95f149bee58217ace82063aacb661dbd000a2a7a383c4804434473c3945cec3cb41d6608388350da3098c32709541
diff --git a/dev-python/mkdocs/mkdocs-1.2.3.ebuild b/dev-python/mkdocs/mkdocs-1.2.3.ebuild
new file mode 100644
index 000000000000..3087ec3003c1
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 04bba5ab124e..5aa8f12a61fe 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
+DIST mkdocs_pymdownx_material_extras-1.5.4.tar.gz 23911 BLAKE2B e78216219a6f66c287c2f556e2e593eccee53529092c5b571593ff6635b0657a23ff83e894fa3d8dda37bb65842d1da434dcf540a9c390927f47c95da189c253 SHA512 77e315cfdb659a13d92e89096bef26a10397e079338f57aac1141ef6000e06705b96d820478ffa6e7827c7873130fbfc6b32a29e1a145d6c788df160e339a758
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild
new file mode 100644
index 000000000000..b92f5d5a6381
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e318b71d2b46..d0b079c46f42 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-6.4.4.tar.gz 14349204 BLAKE2B 3ea06a6433933e0de34be33bc681776a17fec05da643268a262f65146bd707f08ea6acbfe1154ba9158ac76211de78552daec22293a54ba5e0edb848790ccbbd SHA512 c78869b7d75244409cb890d43d05eb5391c27e0de29874f48aef1c22379cdcb5dc7f69969eccd6c0f1ed057ed17f85d39e43cd482866dfe6277b6a981eee39f6
+DIST notebook-6.4.5.tar.gz 14339237 BLAKE2B 932e9c90804e6f759a9cd03c45e5093b26d1477908570726ae4782fec6c1127559f129ba8b9d1b4b4ff8e5bcb7fb32fea4cfafbc4c64b55859dbf6ed08960828 SHA512 8e0f6db6f232b7234e65ac41105cbc81b4d2d38d9f8cbd629ca3722b2fc876d8bd64beb7417e0bd99e3ae0c047be8328f4a0a433c2282defa5f026b20953608f
diff --git a/dev-python/notebook/notebook-6.4.5.ebuild b/dev-python/notebook/notebook-6.4.5.ebuild
new file mode 100644
index 000000000000..cacbe7d854e3
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/pdoc3/files/pdoc3-TST-use-explicit-ClassWithNew-instead-of-typing.Gene.patch b/dev-python/pdoc3/files/pdoc3-TST-use-explicit-ClassWithNew-instead-of-typing.Gene.patch
new file mode 100644
index 000000000000..b969bf4727bc
--- /dev/null
+++ b/dev-python/pdoc3/files/pdoc3-TST-use-explicit-ClassWithNew-instead-of-typing.Gene.patch
@@ -0,0 +1,43 @@
+From 4aa70de2221a34a3003a7e5f52a9b91965f0e359 Mon Sep 17 00:00:00 2001
+From: Spencer Baugh <sbaugh@catern.com>
+Date: Thu, 23 Sep 2021 09:00:25 -0400
+Subject: [PATCH] TST: use explicit ClassWithNew instead of typing.Generic
+
+typing.Generic doesn't have a __new__ method in 3.9.
+
+Fixes https://github.com/pdoc3/pdoc/issues/355
+---
+ pdoc/test/__init__.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/pdoc/test/__init__.py b/pdoc/test/__init__.py
+index e8c3d94a805b..8b67ab77d3f7 100644
+--- a/pdoc/test/__init__.py
++++ b/pdoc/test/__init__.py
+@@ -1043,16 +1043,20 @@ class Foo:
+ 
+         self.assertEqual(pdoc.Class('C2', mod, C2).params(), ['a', 'b', 'c=None', '*', 'd=1', 'e'])
+ 
+-        class G(typing.Generic[T]):
++        class ClassWithNew:
++            def __new__(self, arg):
++                pass
++
++        class G(ClassWithNew):
+             def __init__(self, a, b, c=100):
+                 pass
+ 
+         self.assertEqual(pdoc.Class('G', mod, G).params(), ['a', 'b', 'c=100'])
+ 
+-        class G2(typing.Generic[T]):
++        class G2(ClassWithNew):
+             pass
+ 
+-        self.assertEqual(pdoc.Class('G2', mod, G2).params(), ['*args', '**kwds'])
++        self.assertEqual(pdoc.Class('G2', mod, G2).params(), ['arg'])
+ 
+     def test_url(self):
+         mod = pdoc.Module(EXAMPLE_MODULE)
+-- 
+2.32.0
+
diff --git a/dev-python/pdoc3/pdoc3-0.10.0.ebuild b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
index 7769b43281fc..5f148c0355d0 100644
--- a/dev-python/pdoc3/pdoc3-0.10.0.ebuild
+++ b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
@@ -21,6 +21,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-TST-use-explicit-ClassWithNew-instead-of-typing.Gene.patch"
+)
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	sed -i \
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index df9cc6798449..bfa7dbbf251f 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,2 +1,3 @@
 DIST mongo-python-driver-3.11.4.tar.gz 983009 BLAKE2B b2ca8d90a34b41c0991b545626853137b6a7f5f006dbb5d7a93fd8312759b53b99415583ca5ba982abb420db8502cb9de745f1ac0962efa05eb05ecb4289c323 SHA512 ecd2ff41ab902423dc58901cd9a8355e200f5b00a4eea4a8e950de75674fd59f7367df1ab7ee6c09bf515b8fa110cac0f7de084fbe14527486a9c38a0c8c9c27
 DIST mongo-python-driver-3.12.0.tar.gz 1062091 BLAKE2B 636a34a42d43a6ecd549c51e9e5b3a617291b64a1ba91d7473c365f8df88d59efd7b2906dd80147ffab4309d38cce30a3475bbe142e347312823236f8657c801 SHA512 fc2734b8821b42cca1b67930d5c7612526e51292144a376425627ea6254b09128ccd894af3be293184f940c7f8faa1c0cd3a0d069f9b4143a15cb32279c3bdb1
+DIST mongo-python-driver-3.12.1.tar.gz 1067667 BLAKE2B 3f18c5aa92ce180067f9c86e1fcbd80543274a2ee33ce1fad5741f0e7f5a9cb0520c33b8fe885ea69c2c8ce168747a44129fe79a5df389b83bd5e77a6ec4a687 SHA512 1fc98c33d8140ab045804130fc27b655a8622318f7030967d841e7a296dcdfb89a125cb2574a9b08eef15d3fdc089f268631501743b46d04a7b465cc45c0c04e
diff --git a/dev-python/pymongo/pymongo-3.12.1.ebuild b/dev-python/pymongo/pymongo-3.12.1.ebuild
new file mode 100644
index 000000000000..6466dfd4238f
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.12.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 613de13e20c4..5b458b0658a3 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,2 +1,3 @@
 DIST python-lsp-server-1.2.2.tar.gz 61742 BLAKE2B d0886549d9ebf79bf97be30abb361be1fdee243abf9ed4707e27857122e9721dcc59f968c4ad7d2904ba11f06e6e6dc34593e5255ce0c9c528defdab7b6e3b7e SHA512 afeb0798fef151ab7cb79b3a0b294a30111d4bb409a4a8ad5148f9cb3dfb9a56e0033541b44a2b683bf043fcb31a8d83a788b0c9c22587b6ae532abb288542a6
 DIST python-lsp-server-1.2.3.tar.gz 62072 BLAKE2B 3d84e2d1eb77a706eee2da0e02bfab5e075faec9a0279070e2e43bd9dbfb973c6e343c5c2e3826fd64b55987603f7b1b27762d598bd1b5689f2013e3f5d06e90 SHA512 48b9441962d9d00010cee9b482f141259ff4944f737626630ef5051cac82578c9a37f62eea238c6e9df1b90dae739db335195a9eff4f50d0120721763791dad1
+DIST python-lsp-server-1.2.4.tar.gz 62073 BLAKE2B b1426d71a4da5ac29fa6b3e956010625d594eee7924a51eb5074933866254189a9738895bc5dd4aae8acc1733b9f162b73646d9a3eee3ac17a587456f2da00e4 SHA512 862d59426c6e7c19f9d3d2766ec5f9ec818d29988ee72cde9553e4b1725fbbe4230ed2f6d7e8d08983c9ef1ced8d5afe42d6751ea529d3d8799c8930b1e10a26
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
new file mode 100644
index 000000000000..8c849720447e
--- /dev/null
+++ b/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
@@ -0,0 +1,254 @@
+diff --git a/.pylintrc b/.pylintrc
+index 4249ac5..326751f 100644
+--- a/.pylintrc
++++ b/.pylintrc
+@@ -16,7 +16,8 @@ disable =
+     too-few-public-methods,
+     too-many-arguments,
+     too-many-instance-attributes,
+-    import-error
++    import-error,
++    consider-using-f-string,
+ 
+ [REPORTS]
+ 
+diff --git a/pylsp/__main__.py b/pylsp/__main__.py
+index a480823..4698d5c 100644
+--- a/pylsp/__main__.py
++++ b/pylsp/__main__.py
+@@ -92,7 +92,7 @@ def _configure_logger(verbose=0, log_config=None, log_file=None):
+     root_logger = logging.root
+ 
+     if log_config:
+-        with open(log_config, 'r') as f:
++        with open(log_config, 'r', encoding='utf-8') as f:
+             logging.config.dictConfig(json.load(f))
+     else:
+         formatter = logging.Formatter(LOG_FORMAT)
+diff --git a/pylsp/_utils.py b/pylsp/_utils.py
+index 92376f6..9ac30cf 100644
+--- a/pylsp/_utils.py
++++ b/pylsp/_utils.py
+@@ -144,8 +144,8 @@ def format_docstring(contents):
+     Until we can find a fast enough way of discovering and parsing each format,
+     we can do a little better by at least preserving indentation.
+     """
+-    contents = contents.replace('\t', u'\u00A0' * 4)
+-    contents = contents.replace('  ', u'\u00A0' * 2)
++    contents = contents.replace('\t', '\u00A0' * 4)
++    contents = contents.replace('  ', '\u00A0' * 2)
+     return contents
+ 
+ 
+diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
+index 7ac8c62..aefd09e 100644
+--- a/pylsp/plugins/flake8_lint.py
++++ b/pylsp/plugins/flake8_lint.py
+@@ -79,7 +79,7 @@ def run_flake8(flake8_executable, args, document):
+     try:
+         cmd = [flake8_executable]
+         cmd.extend(args)
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+     except IOError:
+         log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
+         cmd = ['python', '-m', 'flake8']
+diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
+index bdb65fe..69bad1c 100644
+--- a/pylsp/plugins/pylint_lint.py
++++ b/pylsp/plugins/pylint_lint.py
+@@ -236,7 +236,7 @@ def _run_pylint_stdio(pylint_executable, document, flags):
+         cmd = [pylint_executable]
+         cmd.extend(flags)
+         cmd.extend(['--from-stdin', document.path])
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+     except IOError:
+         log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
+         cmd = ['python', '-m', 'pylint']
+diff --git a/pylsp/workspace.py b/pylsp/workspace.py
+index ec031b6..bf312f6 100644
+--- a/pylsp/workspace.py
++++ b/pylsp/workspace.py
+@@ -76,7 +76,7 @@ def root_uri(self):
+         return self._root_uri
+ 
+     def is_local(self):
+-        return (self._root_uri_scheme == '' or self._root_uri_scheme == 'file') and os.path.exists(self._root_path)
++        return (self._root_uri_scheme in ['', 'file']) and os.path.exists(self._root_path)
+ 
+     def get_document(self, doc_uri):
+         """Return a managed document if-present, else create one pointing at disk.
+diff --git a/setup.py b/setup.py
+index 3f79774..14ade20 100755
+--- a/setup.py
++++ b/setup.py
+@@ -52,7 +52,7 @@ def get_version(module='pylsp'):
+             'pycodestyle>=2.7.0',
+             'pydocstyle>=2.0.0',
+             'pyflakes>=2.3.0,<2.4.0',
+-            'pylint>=2.5.0,<2.10.0',
++            'pylint>=2.5.0',
+             'rope>=0.10.5',
+             'yapf',
+         ],
+@@ -62,10 +62,10 @@ def get_version(module='pylsp'):
+         'pycodestyle': ['pycodestyle>=2.7.0'],
+         'pydocstyle': ['pydocstyle>=2.0.0'],
+         'pyflakes': ['pyflakes>=2.3.0,<2.4.0'],
+-        'pylint': ['pylint>=2.5.0,<2.10.0'],
++        'pylint': ['pylint>=2.5.0'],
+         'rope': ['rope>0.10.5'],
+         'yapf': ['yapf'],
+-        'test': ['pylint>=2.5.0,<2.10.0', 'pytest', 'pytest-cov', 'coverage',
++        'test': ['pylint>=2.5.0', 'pytest', 'pytest-cov', 'coverage',
+                  'numpy', 'pandas', 'matplotlib', 'pyqt5', 'flaky'],
+     },
+     entry_points={
+diff --git a/test/fixtures.py b/test/fixtures.py
+index 3ced0d5..e57bda6 100644
+--- a/test/fixtures.py
++++ b/test/fixtures.py
+@@ -101,7 +101,7 @@ def temp_workspace_factory(workspace):  # pylint: disable=redefined-outer-name
+     def fn(files):
+         def create_file(name, content):
+             fn = os.path.join(workspace.root_path, name)
+-            with open(fn, 'w') as f:
++            with open(fn, 'w', encoding='utf-8') as f:
+                 f.write(content)
+             workspace.put_document(uris.from_fs_path(fn), content)
+ 
+diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
+index 046127c..e82a226 100644
+--- a/test/plugins/test_flake8_lint.py
++++ b/test/plugins/test_flake8_lint.py
+@@ -93,7 +93,7 @@ def get_flake8_cfg_settings(workspace, config_str):
+     This function creates a ``setup.cfg``; you'll have to delete it yourself.
+     """
+ 
+-    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+") as f:
++    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+", encoding='utf-8') as f:
+         f.write(config_str)
+ 
+     workspace.update_config({"pylsp": {"configurationSources": ["flake8"]}})
+diff --git a/test/plugins/test_pycodestyle_lint.py b/test/plugins/test_pycodestyle_lint.py
+index c0d1d7e..e238147 100644
+--- a/test/plugins/test_pycodestyle_lint.py
++++ b/test/plugins/test_pycodestyle_lint.py
+@@ -91,7 +91,7 @@ def test_pycodestyle_config(workspace):
+ 
+     for conf_file, (content, working) in list(content.items()):
+         # Now we'll add config file to ignore it
+-        with open(os.path.join(workspace.root_path, conf_file), 'w+') as f:
++        with open(os.path.join(workspace.root_path, conf_file), 'w+', encoding='utf-8') as f:
+             f.write(content)
+         workspace._config.settings.cache_clear()
+ 
+diff --git a/test/plugins/test_pyflakes_lint.py b/test/plugins/test_pyflakes_lint.py
+index 494cb63..d52ac63 100644
+--- a/test/plugins/test_pyflakes_lint.py
++++ b/test/plugins/test_pyflakes_lint.py
+@@ -21,7 +21,7 @@ def hello():
+ DOC_UNDEFINED_NAME_ERR = "a = b"
+ 
+ 
+-DOC_ENCODING = u"""# encoding=utf-8
++DOC_ENCODING = """# encoding=utf-8
+ import sys
+ """
+ 
+diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py
+index cf7a7e4..5b5b99c 100644
+--- a/test/plugins/test_pylint_lint.py
++++ b/test/plugins/test_pylint_lint.py
+@@ -37,7 +37,7 @@ def temp_document(doc_text, workspace):
+ 
+ 
+ def write_temp_doc(document, contents):
+-    with open(document.path, 'w') as temp_file:
++    with open(document.path, 'w', encoding='utf-8') as temp_file:
+         temp_file.write(contents)
+ 
+ 
+diff --git a/test/test_document.py b/test/test_document.py
+index b543a40..3dcabb6 100644
+--- a/test/test_document.py
++++ b/test/test_document.py
+@@ -16,7 +16,7 @@ def test_document_lines(doc):
+ 
+ 
+ def test_document_source_unicode(workspace):
+-    document_mem = Document(DOC_URI, workspace, u'my source')
++    document_mem = Document(DOC_URI, workspace, 'my source')
+     document_disk = Document(DOC_URI, workspace)
+     assert isinstance(document_mem.source, type(document_disk.source))
+ 
+@@ -44,27 +44,27 @@ def test_word_at_position(doc):
+ 
+ 
+ def test_document_empty_edit(workspace):
+-    doc = Document('file:///uri', workspace, u'')
++    doc = Document('file:///uri', workspace, '')
+     doc.apply_change({
+         'range': {
+             'start': {'line': 0, 'character': 0},
+             'end': {'line': 0, 'character': 0}
+         },
+-        'text': u'f'
++        'text': 'f'
+     })
+-    assert doc.source == u'f'
++    assert doc.source == 'f'
+ 
+ 
+ def test_document_line_edit(workspace):
+-    doc = Document('file:///uri', workspace, u'itshelloworld')
++    doc = Document('file:///uri', workspace, 'itshelloworld')
+     doc.apply_change({
+-        'text': u'goodbye',
++        'text': 'goodbye',
+         'range': {
+             'start': {'line': 0, 'character': 3},
+             'end': {'line': 0, 'character': 8}
+         }
+     })
+-    assert doc.source == u'itsgoodbyeworld'
++    assert doc.source == 'itsgoodbyeworld'
+ 
+ 
+ def test_document_multiline_edit(workspace):
+@@ -73,8 +73,8 @@ def test_document_multiline_edit(workspace):
+         "    print a\n",
+         "    print b\n"
+     ]
+-    doc = Document('file:///uri', workspace, u''.join(old))
+-    doc.apply_change({'text': u'print a, b', 'range': {
++    doc = Document('file:///uri', workspace, ''.join(old))
++    doc.apply_change({'text': 'print a, b', 'range': {
+         'start': {'line': 1, 'character': 4},
+         'end': {'line': 2, 'character': 11}
+     }})
+@@ -89,8 +89,8 @@ def test_document_end_of_file_edit(workspace):
+         "print 'a'\n",
+         "print 'b'\n"
+     ]
+-    doc = Document('file:///uri', workspace, u''.join(old))
+-    doc.apply_change({'text': u'o', 'range': {
++    doc = Document('file:///uri', workspace, ''.join(old))
++    doc.apply_change({'text': 'o', 'range': {
+         'start': {'line': 2, 'character': 0},
+         'end': {'line': 2, 'character': 0}
+     }})
+diff --git a/test/test_workspace.py b/test/test_workspace.py
+index a008e7e..44d754b 100644
+--- a/test/test_workspace.py
++++ b/test/test_workspace.py
+@@ -51,7 +51,7 @@ def test_non_root_project(pylsp, metafiles):
+     os.mkdir(project_root)
+ 
+     for metafile in metafiles:
+-        with open(os.path.join(project_root, metafile), 'w+') as f:
++        with open(os.path.join(project_root, metafile), 'w+', encoding='utf-8') as f:
+             f.write('# ' + metafile)
+ 
+     test_uri = uris.from_fs_path(os.path.join(project_root, 'hello/test.py'))
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.4.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.4.ebuild
new file mode 100644
index 000000000000..b04edfbecc67
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	test? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unpin-pylint.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
index 632c8dc3d7a3..6069541ac9f2 100644
--- a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 optfeature
 
@@ -20,6 +19,8 @@ KEYWORDS="amd64 x86"
 
 # TODO: Figure out how to get this to work
 # Please pass a palette class in order to create its qrc file
+# This appears to be fundamentally broken: test calls create_qss() without
+# argument and that function does sys.exit(1) if the argument is None.
 RESTRICT="test"
 
 RDEPEND=">=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]"
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 0878fd4b2ba9..13cbde5f79e7 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1 +1,2 @@
 DIST seaborn-0.11.1.tar.gz 261397 BLAKE2B b281da14eea5e9038af0d79ed07531d0006294d63ff4cabc308a460f1107a7d045793383d200dd2dd63e18b43cea838dfe245b675dbc5c308960c105348e5e26 SHA512 ea33cfdad8c01986291e07b906011f4104995f26a88b2775e155fe4abc28f6f5e224b15d4150a246ef1e134d72bd3dc6f534f7c0d370ca99d5f15cd84e10ccde
+DIST seaborn-0.11.2.tar.gz 268839 BLAKE2B b1ba3a76431843921f01f714e601ebe7ed87a8c4136acb65a7cdb89059d67cb136484cb968efd713a5260caa552673efd5d06898a69624b36311fd3908f00179 SHA512 f08fe82b4ecca2b140a953c89bb7f811255d00ec819225809bb224aadde161ddabdeaf5cab53e3558bb84334cee828baafe0ee5efe465e80875a0513fb1ab9ac
diff --git a/dev-python/seaborn/seaborn-0.11.2.ebuild b/dev-python/seaborn/seaborn-0.11.2.ebuild
new file mode 100644
index 000000000000..16a604584049
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+		backend : Agg
+	EOF
+	epytest
+}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r3.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
similarity index 92%
rename from dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r3.ebuild
rename to dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
index c21e928245bf..2b128aa89640 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r3.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
-	<dev-python/setuptools_scm-6.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 BDEPEND="${RDEPEND}"
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3ed013032ddf..e47a32417be2 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,3 +3,4 @@ DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc1
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 DIST SQLAlchemy-1.4.23.tar.gz 7730769 BLAKE2B ad812a068beba3d55f629d4a3ee5eed6f61e46b19a7e1fcc717cfdd7a8d2cb759d894402a64550576b2cc28d82b53aa56ff4305d45433126a765909150a50450 SHA512 9e668b63487d0b9f9321a73bbf652aa82f31a90222429c4ba2f866edb0a313d8d10989febd456c87bdcde63ab595810232257fb011dce007538651426c1df0d1
 DIST SQLAlchemy-1.4.25.tar.gz 7776002 BLAKE2B 0c0330d07ab022925cdde0e94c4a33f699777239cc444f3ca31eeaf046b91b41dfe281861725af22a34d9641abb32b5e3558f684157bff9306c06b9333b89c99 SHA512 254d02f36df655638b204bbc8dbe6d32ce66e9f4a072cdb78dc7433b4d91b9cc88a3ec7a279ff2c818e0b794cc69debcb38310fa4734d9c295d067ed3dc33c22
+DIST SQLAlchemy-1.4.26.tar.gz 7836259 BLAKE2B 149c9947f5536a3715bb05f5bf72a58b597873f824aa492af0df1a0bcbb0e5d8ff848d171f9d12a9f3acc872d3b05df6e67ed79dc190e82d376df152ad150383 SHA512 0289bfc61391e330a8b3df0876727947c6ebd55b54922d3c6107e47a1da27fd6bf7087edbf259e1ef8e7359f53c73d833185f0bc72d307defdb56560bbb21902
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
new file mode 100644
index 000000000000..cfccf161e9bc
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/urwidtrees/files/urwidtrees-1.0.3-0001-Update-mock-dependency-to-install-when-necessary.patch b/dev-python/urwidtrees/files/urwidtrees-1.0.3-no-mock-dep.patch
similarity index 100%
rename from dev-python/urwidtrees/files/urwidtrees-1.0.3-0001-Update-mock-dependency-to-install-when-necessary.patch
rename to dev-python/urwidtrees/files/urwidtrees-1.0.3-no-mock-dep.patch
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
index 48257a236669..ce3d82ea9796 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~x86"
 RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.3-0001-Update-mock-dependency-to-install-when-necessary.patch #770391
+	"${FILESDIR}"/${P}-no-mock-dep.patch #770391
 )
 
 distutils_enable_sphinx docs/source
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 62cf771c3487..db0d66865a85 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6b129dae702f..08a2cf6a291b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,3 @@
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
-DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992 SHA512 b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67
+DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
similarity index 99%
rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index af29c22fe435..98e557b42691 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-#	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 077cf9f2462a..9ca3bacfa333 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
index 34cc1db8c6d6..c9c2afa0dd53 100644
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index da435a1f8372..a8c443ff947b 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
new file mode 100644
index 000000000000..dff398e68a25
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
@@ -0,0 +1,36 @@
+From 5dff395ecea2977cf149c293c16c4d4a5151493b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 9 Jul 2021 17:11:02 +0200
+Subject: [PATCH] kio_filenamesearch: fix crash due to KCoreDirLister changes
+
+Error reporting was changed in KCoreDirlister, to match the original behaviour
+we need to explicitly disable auto error handling.
+
+This fixes a crash while searching in Dolphin, kio_filenamesearch intrenally
+uses a dirlister, and a nested event loop, if there is an error while listing
+some dir it tries to report it using a job ui delegate, but the parent job
+could well be dead by that time, which causes a crash:
+"QWidget: Cannot create a QWidget without QApplication"
+
+Note that this crash only happens if KDE_FORK_SLAVES is _not_ set.
+
+BUG: 438187
+---
+ filenamesearch/kio_filenamesearch.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/filenamesearch/kio_filenamesearch.cpp b/filenamesearch/kio_filenamesearch.cpp
+index 4d15aac2..5651a025 100644
+--- a/filenamesearch/kio_filenamesearch.cpp
++++ b/filenamesearch/kio_filenamesearch.cpp
+@@ -102,6 +102,7 @@ void FileNameSearchProtocol::searchDirectory(const QUrl &directory,
+     QScopedPointer<KCoreDirLister> dirLister(new KCoreDirLister);
+     dirLister->setDelayedMimeTypes(true);
+     dirLister->openUrl(directory);
++    dirLister->setAutoErrorHandlingEnabled(false);
+ 
+     QEventLoop eventLoop;
+     QObject::connect(dirLister.data(), static_cast<void(KCoreDirLister::*)()>(&KCoreDirLister::canceled),
+-- 
+GitLab
+
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
new file mode 100644
index 000000000000..400fdd859652
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
@@ -0,0 +1,26 @@
+From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 2 Oct 2021 12:53:27 +0200
+Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19
+
+In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp
+---
+ mtp/kiod_module/mtpdevice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp
+index 8fe4abb2..f32cd1a4 100644
+--- a/mtp/kiod_module/mtpdevice.cpp
++++ b/mtp/kiod_module/mtpdevice.cpp
+@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device,
+     const char *deviceModel = LIBMTP_Get_Modelname(device);
+ 
+     // prefer friendly devicename over model
+-    if (!deviceName) {
++    if (!deviceName || strlen(deviceName) == 0) {
+         m_friendlyName = QString::fromUtf8(deviceModel);
+     } else {
+         m_friendlyName = QString::fromUtf8(deviceName);
+-- 
+GitLab
+
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
new file mode 100644
index 000000000000..b23dee6554d7
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://invent.kde.org/network/kio-extras"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
+
+# requires running Plasma environment
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kactivities-${KFMIN}:5
+		>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	nfs? ( net-libs/libtirpc:= )
+	openexr? ( media-libs/openexr:* )
+	phonon? ( >=media-libs/phonon-4.11.0 )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap:=
+		net-libs/kdsoap-ws-discovery-client
+	)
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+"
+BDEPEND="man? ( dev-util/gperf )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libmtp-0.1.19.patch
+	"${FILESDIR}"/${P}-kio_filenamesearch-crash.patch # bug 817008
+)
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory network
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package activities KF5ActivitiesStats)
+		$(cmake_use_find_package activities Qt5Sql)
+		$(cmake_use_find_package man Gperf)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package nfs TIRPC)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package samba Samba)
+		$(cmake_use_find_package sftp libssh)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package X X11)
+	)
+	use samba && mycmakeargs+=(
+		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-21.08.2.ebuild b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
similarity index 96%
rename from kde-apps/kio-extras/kio-extras-21.08.2.ebuild
rename to kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
index abe5cbe7a5b9..79248e2a0404 100644
--- a/kde-apps/kio-extras/kio-extras-21.08.2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.2-r1.ebuild
@@ -70,6 +70,10 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="man? ( dev-util/gperf )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.04.3-kio_filenamesearch-crash.patch # bug 817008
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b5648abe6e69..04aba7145e87 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 440f372f22be..726c75524f7b 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
 DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
-DIST bluedevil-5.23.0.tar.xz 168952 BLAKE2B 073402f8a9b2f90858c61f9a27ce6c458ffcdbee34e6c496ed1eb2e91eb477524a4cbb04f90f0ae55eafc412322f10e15bf6217c827c77772422acd46915d6de SHA512 24bbc722c50762a57e56804d956e912e8f0eed39322b55ef828709f68076c26373af7284e276927c135d11d9cdb5402fdf26feb2308568d7d2c0d3157f3d3026
+DIST bluedevil-5.23.1.tar.xz 169056 BLAKE2B cc2368853e63ec6ec3f29d88fcd85319bb4db66732b6a67ad26559b04fd1afdd7c7daa6c1e8db054f92cc2ebc2d65a01ac9c0c55de486b533ce7d387dd60c20f SHA512 29b5b809110688fae814ece2bcba7bd9df9d7321b55aadd352b5cd996ab097cabf632293c5266dc3d5a883ee60e968250519e56619c1bbd0db1c8c3f13f8dc0e
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/bluedevil/bluedevil-5.23.0.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.23.1.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 515aa4209ad9..5934c7f2b489 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
-DIST breeze-grub-5.23.0.tar.xz 3156664 BLAKE2B 3060bc0f899fb7b0b270a2d2b100d8e834a0b2ae01e79a845831fdb92e2b062b105abeb6e549b9319245d7960068e8ecceda2552ba1d5835ef3efc7be370cc50 SHA512 a207594fd0e85e5d3b29053a4cfc702fb172b513e13bfa997cf9aeb0c9be35abbddfad5ac6367a21b88c2264078cc298af77d8169b05359a267de0a5bdbfa3c3
+DIST breeze-grub-5.23.1.tar.xz 3158076 BLAKE2B cd45478f93e3bd0cccbde3676726126416f9e4797950647f9517a41204dd529f4cbabe4924d062ffd533cb2b91cadc6feec54b2c6f18a08957fe395cbd4cbcd2 SHA512 e78bddcca549999290cd6d2ecb48e5ab6a5c2c3a54eade2808f8bc4e7fcef95f193293fd6c809227fb4efc02f85fec718b3819eca97ff358600e0fa74569d324
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.23.0.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.23.0.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.23.1.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index ae8de73cb83d..d13b5c4ab28f 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
-DIST breeze-gtk-5.23.0.tar.xz 47608 BLAKE2B 54fa789148d58309111e1fec67f2b495ff840d269b4b4fa8e7772103a21c213fd61bd01b0d2f6dc150a90f378559bdca7c1f269662e5581262222af4a346ddbc SHA512 2b14f570615ec48458b7d2acf997d2aa94a29128135162ed89e288b72f24f28be9245b10ae5975c9c223e203ced681c681cdaf4c364c0566492f1f68165f025f
+DIST breeze-gtk-5.23.1.tar.xz 47604 BLAKE2B f57cfef830031f873be33c449691ce04307b81a686086c9a7818a170b2b3dbced33228a57b154077ea3bb64a1e594371c71bceca8975e48097b7895ea81845d4 SHA512 96c9ab272738025cb145a31d808a6104430232448e3c70560a0a98850f9a7dc53a95a41dc91d931ccceef86de02bed5aa0dd80eb38ba1f3d0683f5154d7ebe18
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.23.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.23.0.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.23.1.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 3de245e142a1..87196677f04d 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
-DIST breeze-plymouth-5.23.0.tar.xz 110556 BLAKE2B 81ea157d8681e928e244e64bdcb588a7d25373cde5b05af155098202d285bf118a435f12e6ba3c0481e69c8144791012519e8e7df9bebb2b27829429acfff305 SHA512 00e37619dacbe007de505708e6afa2cf879a2b01555c8afe90554f7cee92367673453b192b7f9adcb7ad593e20326915e98480962b317a6ccf2046a9c2cefcaa
+DIST breeze-plymouth-5.23.1.tar.xz 110584 BLAKE2B d5ea43e046d93af72c74aa8e3b334b8c3816da0f420b7812e55cdf6847f1f38ceee9a7e8581bb4fa9f7461875f8f7f1342c3cb864d1dfb4eb5c9a766cef954b2 SHA512 36a7fd864e8496fb818378d2fe86ea1fdb7ac48081b56a6b0f5be03b2d0583d21f3400b0192fb21cb8cd5c15b48815dfc54e289f3097573730c8b35a4dd14484
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.0.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.23.0.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.23.1.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 9bb5e2be7765..f12614183464 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
-DIST breeze-5.23.0.tar.xz 73812392 BLAKE2B 08583cc8027c37477c432ffbef33b114f69586f121c187c2bb49fa80f283b98e22b9f070826638e06aa81ca9ef5e320caeec25ac02b5a09f9523ca947971daeb SHA512 efc23e6610bc091c9cc38b34a8838624e119839ae8c061df987c98981edf6db0ffc4f47c0dd0c72d2b89c335cb9507a1d76c1c86c5749fd26d75043d92c67612
+DIST breeze-5.23.1.tar.xz 73815804 BLAKE2B 9b66055126d25f70fc5e5c3bf9e8e8d8a2d3d2e452e001ab603b4b365f4c4cfc529b252b8fd5f083a282f632cb381dfc9024cd633271a8de5b8228c397eec1a8 SHA512 df708181a9ed18f3babc7c5fed51f70d68f195a8d398d6e6d21ef7db99f744470e44df61cbd70cb427f9e87177f86e97e5601d574a3267222d69762baeef4cce
diff --git a/kde-plasma/breeze/breeze-5.23.0.ebuild b/kde-plasma/breeze/breeze-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/breeze/breeze-5.23.0.ebuild
rename to kde-plasma/breeze/breeze-5.23.1.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 22f78656906c..19df97c378bc 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,2 @@
 DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
-DIST discover-5.23.0.tar.xz 8233188 BLAKE2B 1870d3309eeb81e772dc1b0201a34b8811a710e9f4c7930538015297ae0c470b29b4b336778d6235a562f77708c701afad3cca23771054b399b1f7d64475b8b4 SHA512 57d36fc8c3ff6f32a312cc5970c7e89ff98f3f41da70fe09934ca0bea1a6fbbd6651e0ed33c9500b9213c7ee46dd50dcb8f31483525596edf281765763c56db9
+DIST discover-5.23.1.tar.xz 8233356 BLAKE2B ca36ff4dee67e1c1a9190e063f2100181c52eac87b52750aa142ae2071153f04ad11a43d2ccedc1b0dbc0723849e3105e439920b2e3eda5082518997727cb7fc SHA512 0de955a670c340d5afa3784ca4820003720795dff5023d1d976f655e56c5caa5b767d7bee875b1b59864f2c905081527d5b6c2a75546799788c0c3bccd6b88e4
diff --git a/kde-plasma/discover/discover-5.23.0.ebuild b/kde-plasma/discover/discover-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/discover/discover-5.23.0.ebuild
rename to kde-plasma/discover/discover-5.23.1.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index d230121debab..c347036c0a06 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,2 @@
 DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
-DIST drkonqi-5.23.0.tar.xz 791764 BLAKE2B e15a44925e87ff4150032bb4c9510c51294bf1fadf9a35f595638bb57b9205dcf998f22091d6317e6f05f352e6faaa66f5bec40c1b5cb37537769b5ac12228ba SHA512 34a6a28c110ac624175fb97b49447616ab4f5e2b0c74a3f5285524945d5ebe444b8dd49c50c4553f82aa0bbdfc25276c0e03690f8240e6db05ceaab6a234401d
+DIST drkonqi-5.23.1.tar.xz 792016 BLAKE2B 97e2121ee7a529034ed1df1511e4219c203edf7caced1cab11a495d951df16e2fd16bd9d2ce27f7317fb639508c043891e9c19ca6701bd50b769a4df9808aecf SHA512 26b0968e8adf79c9990a02c240a0d0f9b3447f2c5bcfa5ecc88d047c2ad1108aa0a4ec4da735f3d12069d48dfe0c350f4c2c4e9603137e14ad4a11e95d10f4f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.23.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/drkonqi/drkonqi-5.23.0.ebuild
rename to kde-plasma/drkonqi/drkonqi-5.23.1.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 6ccaed744aa7..ddd122c13ae3 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,2 @@
 DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
-DIST kactivitymanagerd-5.23.0.tar.xz 104324 BLAKE2B 2d23bb126497b2979e11eb1eed2fc27456274491cb222e1843ef7c0c7cf7520f575f40c25d4cff9e5a282e0a6629b7f942bb45433856c8ffa94c2eec16c1b228 SHA512 2bf99af6f2b594edd415fd0729803917e00f0c43ac27934de0f30d57bf25cf6c7de85d161c359aaddbe60e63afd9dc1dbb1ddaee253554d146a7dce026197c75
+DIST kactivitymanagerd-5.23.1.tar.xz 104352 BLAKE2B 1d9741c196e3d5a763ad6e4c5d3e0e6810d21b66ebdb4f50c403b3b0b8958e5c5e64f2aae576b737bf3d97c5632ebf228f1503653e4a3458bd473c349f2b72b9 SHA512 b39f540490a0e22f6f16c7e8e060740b854309ec38c724fbc6ce67984d1db746ff7aa47d53f5db273bbc75e476efe22de634502ce730f2956431207b3b3e64ee
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.0.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.1.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 59043578ace3..dba344fe7128 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
 DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
-DIST kde-cli-tools-5.23.0.tar.xz 631484 BLAKE2B 9ed278983cf35afbf996fa2a5a7daa6569ea7d663d3f0c512561716de0a817502752521f7c772e196bb3fa43e2af9064080404d7c0be8b0564ba37ad0a568a85 SHA512 7463e306781127c6645beb91e78487bc178850d94816d9e63b9664b7b274d8c47600d412589637f469401779bc4d840c0d2cdc33f462c254c91215b331b4ef6d
+DIST kde-cli-tools-5.23.1.tar.xz 631576 BLAKE2B c3d1f539e57f7fd3da19b99c8f624e810170a475fe39ecf6d33104312d5eaa2dc33cc63e736d7786deadffd6574b2d2630877e89239ff8e77cb8b41c5f354db8 SHA512 c5331b729f7da746ec4bf9d11dd28a31c8d58f51ee708dafcff400cd6a6dd3846edcf434c1c9ec769c2121172fce9e8725a7fb4caadc3c81aed815df4e02dcb9
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.23.0.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.23.1.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index f98ee46e2000..3cda2c509c7d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
 DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
-DIST kde-gtk-config-5.23.0.tar.xz 71084 BLAKE2B 86e52ff3288859c4c3bc1359af52897f0755cf2d9d0e7347d12897bb86d91b4a256986350187df94a613694f06675863c098f7787817c189e1eedb74f3e281eb SHA512 ccf390219a6338fb6dd56e5131e1fa40dc978ea321cdf65d24dc171c5f308f9707127605bfdf1ac43652c509456cea00458ef8c00e77bcd660c5aec0194ace62
+DIST kde-gtk-config-5.23.1.tar.xz 71092 BLAKE2B 99865569fe9032e374cee0088af593550526fc837d4001b58d6ab12f4eac593e0a7becfaccfff91c2bff04a33acbf6f850938bd9804b26e8a96b9846d6991108 SHA512 ee97299fcbe387a2df6a3ff9e4760eb136935d681dd51b0f681edb43dbfe58cc12c09e6fd46c6f6999d683a7c39431ffe443a95514362061f6ff84f14fb8abc7
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.23.0.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.23.1.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 9e9c97c276ca..fbe26560513d 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
 DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
-DIST kdecoration-5.23.0.tar.xz 47348 BLAKE2B bdad2a4c3772f058587d87100590d532e08564d01b2912f23a512a595730a801e502d8aa4f5182109572fa56f0b54759dd8179a9ecf32aca09c4724b346252cb SHA512 9d5a182a36f4ebac996b7e9faf4cb15c6fff7971397a7a2784ac103bacda46f091334cb9bedc8c16a4687219fbf3191d5bf07a440154e97f445259498fb60478
+DIST kdecoration-5.23.1.tar.xz 47340 BLAKE2B b7f0f1ae3148fb4ab343570ec092a17b583d03460718f1afda7a43af929c24de8fe93fc6e6114506dc400ac15c209165e36b19dfe60de03c8b6ee2a1bbe28c74 SHA512 14537f1a7751fd96e167f198d9dc06fe3dc1c55d0a99fad9d092e4796cf79e86e23f830bcf691a0feab10a1a11db52b20e990a8b785ca607932d767350a93065
diff --git a/kde-plasma/kdecoration/kdecoration-5.23.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kdecoration/kdecoration-5.23.0.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.23.1.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 48776f2fe5eb..4a4362c9b204 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
 DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
-DIST kdeplasma-addons-5.23.0.tar.xz 623404 BLAKE2B 0ccbbed7100d0450128d93eccac379643067119aad5e91136604d79cd27432f5ea8ee3323a7a8cce931a8229eb4566464a823093fe4ab38717857c36bdcee792 SHA512 170deb1579581bdf560f8ec31a98aba77a0774b4aca0eac83ea000780c48679c84a58ba8c1026d10f7046b3a2231b12f93f82b58ef77ebc62faaa6b734a4b56e
+DIST kdeplasma-addons-5.23.1.tar.xz 627512 BLAKE2B a94b981d4ea1ffbcdfa239de7088121b397ee669cfc825dd8b3653d41a7bf2f3fd103aaaf4bd92f5105a6b30466b6e1bde126d36a0ec770be5ea169d70e475f4 SHA512 b6b1a6faf0ca99c1a1ff2a3f8d7db81bff1a55215a63355e17ffb95e13eb171204a72eb40d03690b1df50201e8c1f148c60eaa4768a872a37d1d572d6482ed27
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.0.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.1.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index a8e59f7e25d9..31f54a8d8f1b 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
 DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
-DIST kgamma5-5.23.0.tar.xz 83164 BLAKE2B eea83afd969351294651aebfc37fac6f651337d231127c1b573c6aeea583515e573fcb1fbd8286d9c3301c439639306661ce55282c3a778478a17f2fb4370686 SHA512 968189e9d323e487a06596cb4f23df4b53d789b25e11bafc5f7cb07641455c100a04b0981e6bb9335682ad53dcd1ac07eafdc6fc0f0615a2dfdcc0aff104c9f2
+DIST kgamma5-5.23.1.tar.xz 83132 BLAKE2B 1c45553f6f50879fc0720030b2eda665ed329678bf634a742f150579065d6d02e66ec387a178ffb12c7f200eee5805e5ec67eeeb613680cf6a36e57645b2d36e SHA512 0b44b12aba94270c9f6833f144cf2abc3fc9399205dcbda39c13dcd77fc32c6ad834536209949fe4e18857389947d9a8aa38f29c765f73185c97cce510cbea2b
diff --git a/kde-plasma/kgamma/kgamma-5.23.0.ebuild b/kde-plasma/kgamma/kgamma-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kgamma/kgamma-5.23.0.ebuild
rename to kde-plasma/kgamma/kgamma-5.23.1.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 76704ed1079f..528ef770458e 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
 DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
-DIST khotkeys-5.23.0.tar.xz 1850880 BLAKE2B 4099b9353ed974c6a308931310005b6f65a92f7ee58dfb436582b0b00b26c473eb407ea9c2d1a7affafffb9a0e75417376bf0dfd50d69ee484c9a6ef166956f4 SHA512 6381c1d5e5cb82133428df57c396cafe63f43408967d7bcd2db50e9eadf39a17d7bfd01219ce741ce15b338023b3b01fd25353f628941902331e790532c1c44c
+DIST khotkeys-5.23.1.tar.xz 1850872 BLAKE2B 98421d90c22c2243e691dbd6b030d07076177c9e344a9aa22749dadc09037b07fc909687ef249ea1c56a859add5ff6a4055f18d911eb3e0aaf43d3e0a28c91bb SHA512 8aded4fc6a898e77a0c15c0649880305ccd4185f6ba0bba0480815478648ed5927375eec09a5db44f105eb490ab65d2d465bb445da8930719cd7b9f2a082e823
diff --git a/kde-plasma/khotkeys/khotkeys-5.23.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/khotkeys/khotkeys-5.23.0.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.23.1.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 10b90eab85a3..613ec969849b 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
-DIST kinfocenter-5.23.0.tar.xz 1152060 BLAKE2B 44953ab1a354f7d429645aa94531bc7442702d03e02e023e46832e9b8f9abf0932da196865011d57a9c8640cf2eb32aa3dcb0b424d3e9a4df1f8c21c3c5506c4 SHA512 034b4faacacd2bb34e1f65d7058dfdff224848d04cf5330ad3a55ee33fd6ac4bb15bcb984c789ee51579e81006ff1eb4c54f168de105246732c292b4596958c7
+DIST kinfocenter-5.23.1.tar.xz 1152544 BLAKE2B 2d9704b86fac6e41637b22637c70cb0482230361e11547b8a8c8676afd2d794d7e85280b9cd2d5d0786c677941e10b9c34421426e94fc710805f5e11579f6863 SHA512 1dae1cef1ba7fe2ddc94555f528d51b5aec7aa30e6e65aa323d4b49615db527f083cb8dec3714be4e9824556d817a12f35c3f636370dc157d8e930edd1a87953
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kinfocenter/kinfocenter-5.23.0.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.23.1.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 6fbb17dae13a..49e88a770ddc 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
 DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
-DIST kmenuedit-5.23.0.tar.xz 900628 BLAKE2B 3301986c4941d55b4cdd18dc1e1dea655ac56c2c7cfe4e5f10f96a8969d02be376af38e7f5d6099fb21a72977f8229bb7abb7b9561e13940a3d6f168cb0640e3 SHA512 2d3490f2f28fae2723d3045849d119d2356d386513ee19c0aa31b7c8fe872b23bd4aac38d255e8b7a72bca385dd74e8be8e89da3fb8fdc5054cb81dc5ad521af
+DIST kmenuedit-5.23.1.tar.xz 900596 BLAKE2B 6b9a182067a434ae69dafdff89e350326426e0617112608c5691032cabfe9af5c783aa325b298d703f6e5b4efb50a06b959237f10b2cbb87cf0d52f851e0f8f7 SHA512 d8c5e4619b0246faecb35b6aa76a2a43c7b963cb0689a1b2b3ec565793556c5dec16052ac417cfd0ab741f777b58dcba981b57b7cfd803a091571d6ab84cd304
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.23.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kmenuedit/kmenuedit-5.23.0.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.23.1.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index ef0680877f62..c2231ae0a724 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
 DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
-DIST kscreen-5.23.0.tar.xz 131828 BLAKE2B bbb68c112370243dd98108d54b4b94d10d78d0a5a869465cb908992553148f1733fb21612009b7d3f034a30dc617b6d3a6952eddf287197628fcce0ee33d93c7 SHA512 db7eda9e3b4944a93d1d04664a8d6833886e29596ced4b1b8eb451b051e7387384eefbc9739b40d3261aa2aaf8aeadc1586f8b1e624a784990e5a4d57f1a2474
+DIST kscreen-5.23.1.tar.xz 132136 BLAKE2B ebb3c7906055f0c4fe588bf05aff3001be5ce1cfb74d7890a80aa4bcf1712abc926f5284b9dec85b905384522a4cfcee6be7564caa9ad49e4b25f72967cbc031 SHA512 41597e859959063e6ddea766005dde6c4022c6308477852ff6855002dedbae0f24874534a18bc0c3ed81d7a5e4a76bfc8a42a856becc8f19c16e64d4453d2734
diff --git a/kde-plasma/kscreen/kscreen-5.23.0.ebuild b/kde-plasma/kscreen/kscreen-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kscreen/kscreen-5.23.0.ebuild
rename to kde-plasma/kscreen/kscreen-5.23.1.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 181d7dac97d1..aa680a30052e 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,2 @@
 DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
-DIST kscreenlocker-5.23.0.tar.xz 117308 BLAKE2B 92a728c4d71e619143b16540a37d5b670e718f155788511cff11898f4faf92bf601bdb1c7774be30b07cfd28699e2284c43182076a552b482ebd1a635c203764 SHA512 ddc7571bcaf18b047ca666fadafebe5d6b8d23684b57a4531b631fd23ba70b5ad858cd05039ec3cb8f8976a096ebdb8729fc6695515491c272457feb3a1c5925
+DIST kscreenlocker-5.23.1.tar.xz 117484 BLAKE2B 2449ff9182bfe322e24f53bd1704812de69f7e707f0a5b8b63f94542335370da98c20992c6e64a5cf5aa9db539837da83db32c3f0acccae5794d2494da484c5e SHA512 f3564ca9de68464ab27999714d5450afda94398cfbbe958930ebf60a997f9ac14040574eef3f2092a2d8b09be4539b88b6034dce90420ef9e988d53645e6aee6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.23.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.23.0.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.23.1.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 5ecdf67b128a..184e41635695 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
 DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
-DIST ksshaskpass-5.23.0.tar.xz 24080 BLAKE2B b02e16dff364b820e2f23adaf3516efa3dc7829ce31bdef1814dfd46106361bff7a328e694d512f2e9d4a0b129ee0423a3d1a69ab6fb946320052dba16948089 SHA512 4357356ef7a4e81202d9fa7d0e0978ec3be6315c7fd8d46ac081534d9a22f5313c85c028453797158079cde16ba4ca23ba8010c7a606789e0d18f063d6d96ff9
+DIST ksshaskpass-5.23.1.tar.xz 24064 BLAKE2B edfe2e7c439ef346726c73c0ba757cd9d6d7c1b7efb3eb41dcf4a813714f5150bd4366b789bb6ee8212101256424b1fcad3f5a63fa2c8489901bbf6406ebe33b SHA512 6f0483159ef2fe1bc5bbb02d8be440494a1c6cde2516f7f37e8d3e99cbb71e486025ba20853395de49fcf4149d49603342a7e5416382f728f2193ab977d3f50b
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.23.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.23.0.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.23.1.ebuild
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 1465b0da5892..10e614f5a8b3 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,2 +1,2 @@
 DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
-DIST ksystemstats-5.23.0.tar.xz 90464 BLAKE2B b497c12604ed63b4113ed4ee9d5d1a36cb23d9e8f7d548d9bcfe1c8b1472524b576171f2ec9d70f02120efb465d24ef2242eb39c62db5d1da0d36a78288da20e SHA512 7863ae5b57607fb962176db8c16660ab66e8b3490c08d894ffd93a27de6d757c250ae0b5c3a10a0a699b1e4e549fec2161dd59078adcc13f660f848906f08474
+DIST ksystemstats-5.23.1.tar.xz 90488 BLAKE2B 0a3e6e1ae4be4657cd02f08fbc17206306cfd41ca97d8671da29b091e9a10bdc5db8c989276860531d25ed56cfe808bfefd257dde761699e455d98ac39d24562 SHA512 d69b2c19096ab00b876018fc52595a7f71b08121caffae8d435910f07869ca1500d891d537fb9143476efd660f7a557e9897454185ed9de7805f2e72265efae0
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.23.0.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/ksystemstats/ksystemstats-5.23.0.ebuild
rename to kde-plasma/ksystemstats/ksystemstats-5.23.1.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 6b1bcf8c0c8d..a172a6065b70 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
 DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
-DIST kwallet-pam-5.23.0.tar.xz 20124 BLAKE2B 372d973650a18c433bd04cfe085149f298f19b65c0ad3eb81e895e9224df3e8894fc0a06fbd83111f25a2a20ddd6a25f620465a54bf31974923cfffd225214da SHA512 377592c2cce24140b06f7540b14ae870b9080ffd9a458bc72a5ed5d70d4a8a782494af3acad3bee148377f7f369526e8293342d4de388975011f7026f6c22c97
+DIST kwallet-pam-5.23.1.tar.xz 20120 BLAKE2B 4c40d1a283e0837f30a5f4be352f50636cc94c7a67a8e248446dff84b946215fe6f6585ae76a09ffb334376ad6bce1c9777d3b6c6ddf71fbda61acf326113769 SHA512 0e8369a25fdd1cd8de43f8a13ba0a62dcd03a9f20997cf803957716e5ec14173cb16eac350c14b30e25cfb9f547ece97dbc9deb67ff9a1184626881dde433010
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.23.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.23.0.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.23.1.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 5834f0df6799..28b8a0e9adaf 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
 DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
-DIST kwayland-integration-5.23.0.tar.xz 24164 BLAKE2B 314569a0a081076fafdb7bcd7f2a3529c9ec9adde3c6bc795e085cd0ba5c6c777e7f7a67c34bbeb8b8c122b18c8ce357a21b6fce7529ad2f4038cedf909c1e4b SHA512 edc7507d6ea4594bb8449c1cce4f88e1d663b0e36449230369088d354f4d56e3c02f7db166dc98f357667fd53664ff314badef550b17428ca109e5036894b890
+DIST kwayland-integration-5.23.1.tar.xz 24176 BLAKE2B 185b68e76725fc082d1a01a27f577b8aaa7453c15b3a3289999a249b7a99d41e74bd836a443a7fea7b66435027e86878677c79206ce8fd911189ec5dc1f02c3e SHA512 6287004978e61572765d3826d395c643b9e1ee54ae0b82060f0c367663e522abacf8a2e4440c275c39beec836d5c8e5aaa175dab5fc4b77c97dc1051a82167da
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kwayland-integration/kwayland-integration-5.23.0.ebuild
rename to kde-plasma/kwayland-integration/kwayland-integration-5.23.1.ebuild
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index c83e6bbcd8c6..9fcd603b582b 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,2 +1,2 @@
 DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
-DIST kwayland-server-5.23.0.tar.xz 217592 BLAKE2B 7f6dd8e3617249586ab81e56798bd01254d5e532602f7c6e7e5485752f75e8cb862697358b9c8ae94e0577c382174357afefea30db7ddb955b369a6cb66207af SHA512 b3b50d37f441e1a6b5be73b69aad1407c391874fcec2f16a8d5318160112b5a6958072e0dcce79d6dabf63915f97ea47e15837ca156ad42d7ccb50013b140d98
+DIST kwayland-server-5.23.1.tar.xz 217548 BLAKE2B 30ae75ba80f8720700933893ed911d873664b5a73e082a37b3e2304727bd6a3e01d161a820316342ff16df4ea839f2c2f299756e56f0e4d67c83c61e245c9507 SHA512 a060d10f34c83bdbbbe26b007f166f8b10a314d572ef65f801a3191e4685964e0b48a89d9e1df5600cc766c686d9f9eac01c0b7e5178856ced5f8fd9ba5c72de
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.23.0.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kwayland-server/kwayland-server-5.23.0.ebuild
rename to kde-plasma/kwayland-server/kwayland-server-5.23.1.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index d20958add06f..451352d92a42 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
 DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
-DIST kwin-5.23.0.tar.xz 6332960 BLAKE2B 2efe7d50ac6dd6eece6f27bf85bef6d470a9de7c293397d5d6e2e76307ec652477150c70a6ab21f4a842f3597622808c7dec0e6e88958a3af9e503622743ad47 SHA512 46f6fe40d3d93fb0a8f7a2495e4fa3dbbfb9842a569def0227d49815b9af3853be76fd7bf56c77d42134d209d588f6d3ab7baf2dfb0cbed906372c368ae12bdb
+DIST kwin-5.23.1.tar.xz 6332136 BLAKE2B 17236fe39f1d8c842c3003aa9d22fc27cc018bb77b1ad8d73668face0d8bcff25c964f1273281edf8437b8a33fbc1c6ef5a0b93f464e98547234ccde681c5601 SHA512 b3dd5585f2baed520474d12d301fb4d3d356fffac5f532dcd642d5413627f6c7f02ef6406da584db1cba99bc96e983d6ea5b4a2104d2f39ed219f25fed7d3a78
diff --git a/kde-plasma/kwin/kwin-5.23.0.ebuild b/kde-plasma/kwin/kwin-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kwin/kwin-5.23.0.ebuild
rename to kde-plasma/kwin/kwin-5.23.1.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 67264cf0a9d4..02cebdd31d8d 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
 DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
-DIST kwrited-5.23.0.tar.xz 20512 BLAKE2B d2f5922a42f6f10d55f7af5bd986de25f385cda50b943163ecff5ae139aa0e4dc96c3f6398ad53bc30283c4926b1bda8a93dd68375870427c2737550e3349bcd SHA512 c06d94803bcf1af981b2d840d1504d5b2df0c37649c9257a7d72ee703da88fec4e8fe021149dccee54bd87c14a294485bc4b5f58c079a5aadd303cca87e48cf4
+DIST kwrited-5.23.1.tar.xz 20512 BLAKE2B 870b13092514e3a8b637783017e9bbe580b0901f4d07ec01454c873baaec8f12949cae08cd2082841a114b6019f6fbc149ee91f8fbef6ffb04d4a03889475485 SHA512 127c7fe44277aac3889b530e18c350cd15fd340846eeb259333d59a18427f3cfe292983fd9953d222b5c5d5f0266c81b99f1bd89cbeae1616d53d86f4d5778ca
diff --git a/kde-plasma/kwrited/kwrited-5.23.0.ebuild b/kde-plasma/kwrited/kwrited-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/kwrited/kwrited-5.23.0.ebuild
rename to kde-plasma/kwrited/kwrited-5.23.1.ebuild
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 39ae9adc1fed..dda3fb5347f0 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,2 +1,2 @@
 DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
-DIST layer-shell-qt-5.23.0.tar.xz 17760 BLAKE2B 56767e5979ac862fdf6f470f76277ea316d0b30d86302a1df499de082628966343df0610b1bac449fa9eb1546f27d21f289955aee591afcd10e525a26685512f SHA512 4cd5f4d37e42e66f287805540b799130e0fb8547e9b308e81dadcc2314b4b427b0dc3d9a9dc83d410691e166f89a2ee4ec9635394624d397f199728e27c5f7e4
+DIST layer-shell-qt-5.23.1.tar.xz 17772 BLAKE2B cbbf4b8bea40c6e162f9361281bd733f73716b4fec4f32d01a203bf8dfe95d0834af8a5ba49fe2e956da55cfaeab604690b8c12124381cd4df275a54b7e1420b SHA512 42bab4108ef7057a7dfc5ac09cd8e947e9a7dfdcf6d7c453bf6cc5d93c33cbd8ab6ebd703e311fab823d82a3a0007e7866bb3b83c49b08a86b97f7169048d0f0
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.0.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/layer-shell-qt/layer-shell-qt-5.23.0.ebuild
rename to kde-plasma/layer-shell-qt/layer-shell-qt-5.23.1.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index c2fb7863507d..491288f066d9 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
 DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
-DIST libkscreen-5.23.0.tar.xz 97908 BLAKE2B 94ce0cab29cccfcf724f81ed96fd1bb746fbd5789c221fa23bf213caea54e2f10534c9768ad469727be41dee201746018f7c6a6fbb3d69238bdd5d848390e36f SHA512 2ae61597668377b8f6c37f3a48baff775ed557ad02f3ca71fa2939f05fa0b5d765a801232fec34647658d21b9127f78e07c76b596ce4e8c5bab7e78d7b21eb50
+DIST libkscreen-5.23.1.tar.xz 97944 BLAKE2B f3d645823c0fc2eb10f179f535cccd210726a5036e53cf3800d18c9d09fd7d7019a6d3b81eb924827df56451d7b62969961a964b2c585c745bb9455e37453dc2 SHA512 6357864965f6fec64bba8c03766b41e0ecbdd20ece92fdc907ee0a18fc464b93a3ad905823750fb9165898f2620d4b27da73067601391a9a3956c07c768bb81c
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/libkscreen/libkscreen-5.23.0.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.23.1.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 459b69060357..47083ecbdb73 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
 DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
-DIST libksysguard-5.23.0.tar.xz 768820 BLAKE2B b10524f86cc8feef7e8abbf076c5fdfa20948f431f9e0708d2d11e960270f2eceae8c08c5aaac4d5e1a56aaab0d8e17b28a8162b300d1dafba8e649d01e779b7 SHA512 e63f63945a2c0170c1d603ac143fa92265e6a081c3525165b4ab5dea11e0a6d456e945eb35e348444c24eef2f48c695b54867708777757db39dfb2aee5a43ea1
+DIST libksysguard-5.23.1.tar.xz 768928 BLAKE2B 8c78c902e570c64f48886a821efd0da6e7665d7df23fb8e32269e0ea915615f9f8cff26021e164a31a12d78d0747afa16387e4b85e242b80a4fa6454ea7dfe4f SHA512 49818f40b0c01e13d57651b21913a99a059625ef897b7df6eb57cde0ca077df2a749a664bb9cf90bb2ce8a54108ded34c8ca678d763586b272681fa214a27a7a
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/libksysguard/libksysguard-5.23.0.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.23.1.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index eaf6c4550126..112f081c774e 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.0.tar.xz 8995284 BLAKE2B 792726e81af7eb74193b5ea3eeaf5e36d408b329fbad497dfed92bc8b426b6802c4a841382f4136e24a6c71853eb3c94a9d56cbf1b28a87e0f82e2bc5d21844e SHA512 db11e9425fd90efe50cbe1d59ee863b1d06345a6bb476bf75ac731008970fbb2a92e058c6db5c9f83b084e10953ad3eb333472c5b2596170b6f38475e60dc2c9
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/libkworkspace/libkworkspace-5.23.0.ebuild
rename to kde-plasma/libkworkspace/libkworkspace-5.23.1.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index fe8cc0ff9c25..917835ce5c8c 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
 DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
-DIST milou-5.23.0.tar.xz 47908 BLAKE2B 4e0a4cb36b9a75dae652c875db8580f4222dcc368173ce9728ccdba23a3c5a945ebe63c585ee205f36c97c5f07c3a08df0f5e0ff94cc232fea7c0f5f3e6cbe17 SHA512 5f4873e9c6530ec0fa0bb6dc75a2999c66ca70e357f6337692a5e89ba47d4e18fdd6cafc3018be52919bb1307b14e7acca88e636915295686f00c15c2d1425c8
+DIST milou-5.23.1.tar.xz 47896 BLAKE2B c5b5fc16a7a67cdc21648fce6bbe86dbc190faddf442607effec5613073d42aae44bc0eacd512f2b8ed3ebb0b369345e0a734c2f81894e00601e3f5eeab0227b SHA512 4056abccfb4fff80ea00bd53c753abb3caf63d35850ff57fd42c36f1ef013c6b133404c512fa41def3c3750f57019e987e0d9d963369f3d4e06540563af600d0
diff --git a/kde-plasma/milou/milou-5.23.0.ebuild b/kde-plasma/milou/milou-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/milou/milou-5.23.0.ebuild
rename to kde-plasma/milou/milou-5.23.1.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index e797fef6f906..3b8ae7d595ce 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
 DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
-DIST oxygen-5.23.0.tar.xz 4610508 BLAKE2B 26b08bf42713f0d77dd00a6c6b7e876abb65a95175e373d52b9af71cc1a6aefce233535591dd5213fa971346baa5a12d6b76260047f297e5ff8d891676ddbc75 SHA512 c7cf4cf0d1c7b7235106ba2c51d474fe71a4686bc2802e8d2b7b35c887817f0a9d0d1f5bd7e0d5ec1e90800741ec0171b9df5293864345b226fae55a2d1035ad
+DIST oxygen-5.23.1.tar.xz 4610176 BLAKE2B 539333127e2fad184ed2ee182232e4a97a97d77469ccbe456d5a4cf93d106bd1c0b0643b2b2b4c15f53134257b39ccc6687d2a038ed5798e09d671e0ef3381dc SHA512 cf1cbae0c14189382bfa2e7b4b20ffd8457ed2545da4429b4f9b5417da4f23d6e1b3e9081b772c8c32f49947f4fa38c0778084c4260d3ab090f624bcade3aa28
diff --git a/kde-plasma/oxygen/oxygen-5.23.0.ebuild b/kde-plasma/oxygen/oxygen-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/oxygen/oxygen-5.23.0.ebuild
rename to kde-plasma/oxygen/oxygen-5.23.1.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 72d489ca6d73..f22e0af74d97 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
-DIST plasma-browser-integration-5.23.0.tar.xz 219600 BLAKE2B d5407ef4b2a9eefc583742b8fe465552f57b97fac4623c1e2cbd9bb8ee6f202f9b6a89445822b6bdacb4f72244d2e14a0629e8def235282678a921be84277e11 SHA512 477f710b65ad0de8ccddd1bb910451b3d183a31785792bc4500de71670fcacc2fc264991a165240654f76724279c62c12d3e1b187e8604a05e6adc0ec7ba38fd
+DIST plasma-browser-integration-5.23.1.tar.xz 219568 BLAKE2B ccaa8ce82b3926b943ccc3ba2cc5eec683d9caba94123719e8d9c6c83494b691f05eb082327c9d1ffcb51ac4a9313f38a6666f96d0761a429cc9cb62c0b6818a SHA512 084437387f9645007e552d3b33b4b20c593023c109589bcc7efc2543bd8caec385e5900034822f322e4dd7f3f904d8a1f22ba3928d4ba3e977b35409a1677977
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.0.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.0.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.1.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index a1db1ced93d7..8e502fa963ab 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
-DIST plasma-desktop-5.23.0.tar.xz 15783688 BLAKE2B 340831bfe2cdf5a1ed6b4356e99586e72b9416a46cb065fd73d6a74bfd186bf6beef26cb06bf4fb0a7b899ced16c34b07846f84fa758d032b65d9dca8e9bcd2b SHA512 f7d74842874475741709d7fe76a8fe7fe7d98692e2864b8c008b2e3c59a29f9fe70f21cf16163e2ad14600060e835246e5cbf86676430b6c0bac1eebcf72686e
+DIST plasma-desktop-5.23.1.tar.xz 15785208 BLAKE2B 528653f68f1a3e17fc38859d70fe3f985276d2a8cb73b2b5f47f195238221d17ce65e678017ac88ab2f760d2db23b3efbff2c076d2211c8014805e06c1e1852b SHA512 f6f0483e9dc8e64b4def5e723d259ea32ab5b1556d8486a406b3c65e55d5b7d332614ded8c4f651785890067cd6920a497a110905f2cedb9383b254eab8b2505
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.23.0.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.23.1.ebuild
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 8c15003d65d7..f9f21f94dcdf 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
-DIST plasma-disks-5.23.0.tar.xz 86640 BLAKE2B fabd47fe1b13b2799b47c96a8ba445aeee1e0872510121fbf806f17bdab32aba9a8fbf6d861a5c54ca58d084c3ec29853046d28c11a559fb56c6b5ee0b9a2e16 SHA512 d76fa1411d10d27c8f086be0cf7567c6b7759416432f37380ecd230f9dc803b002d557bfc6db4f5b44c0b91192c465f6799df501bcf08a9bd18f838acfde1571
+DIST plasma-disks-5.23.1.tar.xz 86624 BLAKE2B 7a6d6f6628f4a27fa4148c5e57e46d504c4823307814136b76748c263246d0eaa91c0647bc2dcf0439d5d40277890952f0b4f596f7a23a21f7fb3227ebff7dbb SHA512 698d90d6066408f5c8eb4412092a50ba73d6b50f4de3b01c80679c3f458c6449b0a4431f5ddb5da089f567daf7c67a2f39448d94ac40ddeb4fa76cd3bd884640
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.23.0.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-disks/plasma-disks-5.23.0.ebuild
rename to kde-plasma/plasma-disks/plasma-disks-5.23.1.ebuild
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 9b4c40680117..8e7454141ff0 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
-DIST plasma-firewall-5.23.0.tar.xz 343652 BLAKE2B c7d849874b6609c562589983ade86d02635faabddfcfcb1345323bb702e467c5a4f8319be54c3e78e32c7739379818f2b6a2006227feceeb1084c2a0a909a777 SHA512 9b8e4cc523c6f72033c7a85bc968d591d26b26a89f96efd9d84bed8942991215a5e52eddc3205797310f831c948a125e930a4868cbfdc9fd546c93752a25b1d0
+DIST plasma-firewall-5.23.1.tar.xz 343896 BLAKE2B 1d4b4a963cad1e83227141867998fefe11b4d1cff425e217400acfe4c0e056db9408bae984f82d602962cc0cd7c26c8019e9b5f3b751f397e3396bb728d95b92 SHA512 fd8955699c02e902a97b9b3cdda583af0a30676d6dd281877ee64eba6ae626a600ee9eb24de2c32163a9cf205b5ba94b851d7990cf6b822809ee55a2a982cddb
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.23.0.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-firewall/plasma-firewall-5.23.0.ebuild
rename to kde-plasma/plasma-firewall/plasma-firewall-5.23.1.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 8c9fce007ec6..e0ad626e95b9 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
-DIST plasma-integration-5.23.0.tar.xz 83036 BLAKE2B 0b2dad6f6646f37c5b71f788b72de003e132aa6edf27e6841ab7948c7273e5fa18b1f6436292a0b71fea1c7ef0f241a7ba464a3fc5ecdbea11a97ef4237a2581 SHA512 65cf1d5b733e8b1a77be57c58984ee472d0a5b0db37bc02559d90a96ded2a949ed2eb1ec39db9e12ff6797efa4a8b363fc23c6a899e2b5ffd5c7378fe5429629
+DIST plasma-integration-5.23.1.tar.xz 83076 BLAKE2B 97d8581e172fc0f95d31b77faf7a91c132791001ede9059981aeccd633b18951dd93522369c47856be466428bebf81a04e3d72cf9063b3f55a2c267973ef8992 SHA512 7876c4c5aa63b1d521223a61530f6181725efbdf78fafb668c5817ced7b5710d30846b51c9e073be1bd4e048b645719bee59b34b32acda17a29c2a19668f984d
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.23.0.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-integration/plasma-integration-5.23.0.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.23.1.ebuild
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.23.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-meta/plasma-meta-5.23.0.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.23.1.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 0f7e06ee98fc..64c8c9f7380a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
-DIST plasma-nm-5.23.0.tar.xz 919320 BLAKE2B cb8863a9291ad683679e1a96456bfc5b14b414b66f222f9963063b84978a01cc63e453592580a5b9f9ae0ad3a6cdc49188a47cef79650702b17038910db76e22 SHA512 d97480995ac6d9f7304b8cd7d740d402b236f0a2ffd9b159d37b1a6aec225038d30ee3b785fff3ab3355852d94a2e2124da49103efa7563a5aa62c980390be01
+DIST plasma-nm-5.23.1.tar.xz 919792 BLAKE2B 2114769a046952465a07b3269fbd978924d61e00408af66e89bc1534b99ce2fcc2f52d10e2a07aa7c83e8391d4b9523a989e40a1c42dd40f2b5651c7314fc868 SHA512 dfb6e9894524c2ebfe1b0bc14ec42636ff6b3f08cd378d54610a6e27f40736fc9d3a97ec060447c7402990c85e3e819dc4c1f97d0891ab84f05f9ae96dd06c51
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.23.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-nm/plasma-nm-5.23.0.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.23.1.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index d4429aba282e..86df5377c65f 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
-DIST plasma-pa-5.23.0.tar.xz 129980 BLAKE2B 1195c24b2292662cc59ca17f95e0e3e8fddd380df1036ca8c1c3610aabe181ffc46be05eda43178b00d383ad689d62ade71510245605fee51d52e01227afdeac SHA512 02dc7f16bf5c664536ee82ba5aecde8c4fd07b6fa73e92c8619a7a2e7a4311546a13f987f0e92f45c9b863bc2cbf61e1465d081ebaff39f74006e3fcee54ec64
+DIST plasma-pa-5.23.1.tar.xz 129972 BLAKE2B c16c4a61bbcf725b408ef00e5f07db3fb4fa9390ad7bdbc96181d45cd331a701bcec4609adf561ce96065ff941fda5432f913c77487f8f06168f7335aef3acc4 SHA512 b034a0e1236089e244f8f9e274603c86032e6c82accff0d48f4db732bb0c727f33480ce1faba955b4c436f91e4ef5de5088fca1ae3e10dd729fa51a48322b089
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.23.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-pa/plasma-pa-5.23.0.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.23.1.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 13ccf9189383..b461fb3a0f8f 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
-DIST plasma-sdk-5.23.0.tar.xz 275332 BLAKE2B 648b742713758601422aa84a3b388d53540a102b0f9068e692655de6b5887e623e667f952ba89dc6387b9d57a0ff3cd27afa9a05b09c2dfddab78e2184df16d5 SHA512 9218fa1b75f53a08434fc8cc8d06a5f7b01d87efc7322b997f4074b3e05d1500840fc4752b19f941ccbfb4b18341013976c0d06d84a6532cf3549456085b50f1
+DIST plasma-sdk-5.23.1.tar.xz 275828 BLAKE2B 88a97fec302deb0ecdabb4ecf92673413e780707a78c2e1a5c9ee6c0d45793df8e2ba70f4fff1b427b6b7f1dc80adedcddf613eb8ebc7705400345e3e4caa43a SHA512 1e8c03f6889cf289525506141202875a5200a07f0bead40b005a25e74e3b191aa016cb12584ddcf4890eecefba97838d51ad54fe531cf3cee324d17914e6f826
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.23.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.23.0.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.23.1.ebuild
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index d0280e394d3b..2014cd261066 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
-DIST plasma-systemmonitor-5.23.0.tar.xz 144672 BLAKE2B bdb70888ca3f5b2323ee5ccfadfbe39c2091d27df29ac1212bd4cba2a5ce802be0e3a8583f85362d877efd27f516bdcb537928969ede076c30ce26b68d8533d1 SHA512 fbd59ce8071c73fc4e45d020bbea517676b5460aa333eb20831e0f2e7868b51628818d73aa6de227eb521f3cfa4c97c601f187cac606503393d5806a2dbb1c9f
+DIST plasma-systemmonitor-5.23.1.tar.xz 144716 BLAKE2B 3a8d804d19ee5018c67bb5a523a8ea65c12cbf87020159143a01d400b1beff495ff467a6bd066d2d73e85113837030d2fd02e012472ee148da579f44c5e73312 SHA512 bfe8e4e21070266dba3645efeb432e06b8637044f1c0dd652b1140e1ec38cd607c70dae50c4f1d078a63bcd8a03fb41de6c96c8e372114ea45aff3979f27d02b
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.0.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.0.ebuild
rename to kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.1.ebuild
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 821754955900..a8cff21abd93 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
-DIST plasma-thunderbolt-5.23.0.tar.xz 65036 BLAKE2B f5b2ccf5049f01188b55211ac9ce891c0b21c9c68717403856226f4ee349ebabe4fd16ba3517df9653478569c8ea19a84f522729e548aa850ff561fa06a2c1b5 SHA512 91cdb56346f80bb7f0d30efc7a532893a3a2ba0fa1ab425bbc17bc282a73b8c8ffeee16701477e4d8ba81c008a6342d82fb6b93fb55807e534e8c0946bab78b6
+DIST plasma-thunderbolt-5.23.1.tar.xz 65100 BLAKE2B 80ebf5c5ad0186d83c80ab8840983b4143e407374e23657a825bdb143fa5c42bd1fb5f37a96e61c92da2d2019a6b75cc10b98939a1a6a29110d202cf5beb9fb6 SHA512 3a478c5af64b01cd5595d8b0497194b9862e4017d9e4fd2d0c5941aeb8179b656a6adbc8d09490e0c5968dc952e347ebe6137a83eb1e50b42abe4566cc63ba46
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.0.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.0.ebuild
rename to kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.1.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 25348c830f99..facbc1c08305 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
-DIST plasma-vault-5.23.0.tar.xz 176204 BLAKE2B 2e3c12091ed3effefb061c5a0d8fd22b2803f643168bc1975d0079bbfc88cfebdb046154fde5d885e62dc4f3fbac10e8cf8a578d5da1cbb89e1264f6e69a3714 SHA512 c4afaf69e4f3cd9cab4a816a758b161d5d552ac1e539093ac69c4df76c64636e72ae410d229588f82733c40b6562ffa9646899eb4c12e5c1988ff101319bcb24
+DIST plasma-vault-5.23.1.tar.xz 176204 BLAKE2B a1ce1cb71d4b8619f6aaa02e1457ec4d04adeb8211264b9c53b81a0f9270b73bf801085c0a5928c1f54cfdf37da15f1de96918749b4e4e618c512695c5d58f24 SHA512 820d45eb4be3884c560d7de854ad111872fda8fa198e99d72ba79d046a83917982f4aa7f32cf4a0b0c79666443e0dc060dfd17404797269686979b140535fa54
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.23.0.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-vault/plasma-vault-5.23.0.ebuild
rename to kde-plasma/plasma-vault/plasma-vault-5.23.1.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 9d4af8639b6f..a491fcdd6fd3 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
-DIST plasma-workspace-wallpapers-5.23.0.tar.xz 57049140 BLAKE2B dc4480964478d9471ef9f4c220448c8cc26569e98c5ae8e778d1000027dcf4fc0bbfc8c77f2e16e697d31b1b238a8b0d1835b9e9cd9c8c6d547bf3be43f55c80 SHA512 12a6bccb4e68ec34ef68ad30fd074bdc01446bc4dee3cc1c1207c846caf36b3ba45e3e0e3b22642a6296f7424c6af2816593fe55790f0e4cc25d8d794efd76bd
+DIST plasma-workspace-wallpapers-5.23.1.tar.xz 57049044 BLAKE2B f2d411fb682ca8a665bb4bd51967c672aab4a4182e0e824f5ca9917a8ae5c577eff78a6698b070e98598c2e95a54a36e86608947d776bb877c15df3979c70d5a SHA512 2f6fbaf90888311fb679f0b0c593aeffeb9faeb1292403a33460b40d0ab38e9a52a606b8ed2ff0957962f439b17ab803ad550dc16092f2173ceebf35319cb7ed
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.0.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.1.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index eaf6c4550126..112f081c774e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.0.tar.xz 8995284 BLAKE2B 792726e81af7eb74193b5ea3eeaf5e36d408b329fbad497dfed92bc8b426b6802c4a841382f4136e24a6c71853eb3c94a9d56cbf1b28a87e0f82e2bc5d21844e SHA512 db11e9425fd90efe50cbe1d59ee863b1d06345a6bb476bf75ac731008970fbb2a92e058c6db5c9f83b084e10953ad3eb333472c5b2596170b6f38475e60dc2c9
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.23.0.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.23.1.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index cdf8a75e2316..c044233cb73b 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,2 @@
 DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
-DIST plymouth-kcm-5.23.0.tar.xz 39272 BLAKE2B 310aed9fa4f5c7e8ac3218eb31116b512586d235bc0a66845a4cfe8ff46729711a8c98e113e84015e4ebfd9974ae91fe9f37297437e6f7b9185268eee7754ef5 SHA512 55b5727b10bf5feca0e87fe644439c0bb4cb69c8d0a9e885a6b131cb96ea3fd904c426e8fb395407774e3caf411943420320baa3c21e18b494653b6723601a6b
+DIST plymouth-kcm-5.23.1.tar.xz 39260 BLAKE2B 96420ec5101ae579e7e8f0f03e415a6d11683762a701548892f44c7a9cceef2cac41462a863506cadecaaef09b0803f741393bc6acd361a3012142c21fe0551a SHA512 bfb01b1bcdbf1915bdfab6f09f91baea1b3ff3592e5e06918a1ad7fe8a0fad64ebaa947049585f40bd3d3c86b894c09731a09bd541e2598c884e966a7c4fa09a
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.0.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/plymouth-kcm/plymouth-kcm-5.23.0.ebuild
rename to kde-plasma/plymouth-kcm/plymouth-kcm-5.23.1.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 9b35e8c60921..ea969bf51cc6 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,2 @@
 DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
-DIST polkit-kde-agent-1-5.23.0.tar.xz 47556 BLAKE2B 98a79bff1189259915bec99229030d3c6efe79e5c671897f80deb65a559cd26c77f3eaa0594966c03eb553c5c1adc734be86c85e9d416fe298d1a0062b197f5d SHA512 3236ae603147348ace30c50d851cd2a3942cee33c3013f69d749da2616c290f533dd9c5de899d6cf9d51c40862d7cc9d99155a690d1c0e3116db281bd427de76
+DIST polkit-kde-agent-1-5.23.1.tar.xz 47548 BLAKE2B 48da14a9730eba8310a63c67591458f2b2a131e050ed3f6fe9999f5cfcb8ce4ba2b92bdd1819f01f152598447e426766063cc1d885cdfabfa3b8c794abc33937 SHA512 3edaeb39d4fd28c3984f0ab3f7007cedcfd22605ac10093af5a5a79d7eaf892ad7e8ad297767000d58e9751915e4c5a26a4c6082b1d3120ec7774db3222dfaba
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.0.ebuild
rename to kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.1.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 1e307840bb93..3ed9799c6842 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
 DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
-DIST powerdevil-5.23.0.tar.xz 627508 BLAKE2B c0b243714b34ad9475c87ec6ac3f30debd3c8d7267fee279e488670c833f03d3224ab3d55232f97b7c7d0304921e7e9043baa94de77cc11095eff434e72d4ebd SHA512 e049e3765407d3e4cb2ecc27b7f2cd7419d042be187f4b2f047f131d8d9d204be0e2d109ad8d8a1afb71d468853e32d769536d584b6f894d9bfb2b79fc7f7a40
+DIST powerdevil-5.23.1.tar.xz 627656 BLAKE2B 8b6e2f0dfea03ffa23d2830fc391a4fbb7b40c01e5d7897fa12bc748076e813a9d73cd1d6b3bef236cc5b7e5eb4a5ebadc3ad4d1a231ced345a2e6c690aa866c SHA512 ac0fe98b11a27fe0e95006936e88b64c4b217e538033b0b17ffb6014e0dc01b95d8194565f2bbe4090d682a0f6c2aab239d657926714620f9469b37949664355
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/powerdevil/powerdevil-5.23.0.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.23.1.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index a3e84d5a697a..f4a9b793b5c7 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
 DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
-DIST sddm-kcm-5.23.0.tar.xz 77528 BLAKE2B 25d8ad7115e467310a25c4919ff5f56c0feca60a1eaa9737604465f1f2cb29fc9ef217afaef79bf2ad94f67751894ce2d1cb5c60ce2c64d679c3d342525ca6cf SHA512 45fbe87a22bd632047e3399dd06616dd0950aaf52ecce6adffd64ed445e2bebe57aa2e9869786e8219952e201ec0d29fb19d0492fc7cf77b14457a60a2aacf52
+DIST sddm-kcm-5.23.1.tar.xz 77544 BLAKE2B 1a21a0ab9d24c9540d2667e3bc6863bfd24db3be9a9148f52c5c7338630a7f74f1829c0a1089bc4934bf5aca5670851874094e346a864861e2e3aaf4f24ed5fd SHA512 7dcb5aa5bc22fad6839d0f03de79ff9faef4b28a2710ee5ed96ecb1501272be6837983eac3cca698b52383f17fa78ee9b2507862f7e167373b0cd7948204798b
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.23.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/sddm-kcm/sddm-kcm-5.23.0.ebuild
rename to kde-plasma/sddm-kcm/sddm-kcm-5.23.1.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 11908eccccc5..e74ff39e2d20 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
 DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
-DIST systemsettings-5.23.0.tar.xz 203664 BLAKE2B 59c9736edb558c913b2f7a021bbfa1dad45fb6620a27113ae49996d569c080faa9d7d1502a3598c014f295f2c6dd1e15f350d848b88fa2b221bde7b34be2f195 SHA512 8b45f0dcd102b5bf3780c621e2cd2c73cfa7a3187a4152866559b2e851c51f045fa2674dec972d2d8a6d95cf483d3c1bf34c81c2f4742e979d691df2ebb9307e
+DIST systemsettings-5.23.1.tar.xz 203448 BLAKE2B e2587dc11d6c7d2813db662e6e43a14defc2adbdfd72ed6e94ce0057b433531b4bdac7816b8dbd187ed0f7b173168fb80378e1325fbd10c42b02750e23dce9f0 SHA512 df352da43fbe0fdf3d467f4bb0eacb6d0f05498ff36623bb721a56882ce239ac4e2ad73964d2f2cfe29c039a2b782fc81ccfe5edfc0cc21dff06cf597af15227
diff --git a/kde-plasma/systemsettings/systemsettings-5.23.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/systemsettings/systemsettings-5.23.0.ebuild
rename to kde-plasma/systemsettings/systemsettings-5.23.1.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index c18df1bfd81b..bd8d8d882be4 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1,2 @@
 DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
-DIST xdg-desktop-portal-kde-5.23.0.tar.xz 89340 BLAKE2B 54773af6a4a9d363780c92c95c735561cb18385c01b147901a5faf3ef304e411b8341faae670e49a84ad9840913e1c9c9d73ba0a09ef64841aa13287cf92cdce SHA512 4ad0f27d67bb9199dc779d687bf6f03c5047f429d2a8ad5708d50294b25c29fd6061dc5be1efc33f646d2963e4501a717a90107d17c1c9be2337b5a04f580ccd
+DIST xdg-desktop-portal-kde-5.23.1.tar.xz 89376 BLAKE2B 64e584218b51d0d101b4ac888d16dd8d10fa62f224997c81dd812093595dba43d8ef4f5d2eb298593caabe06af1d1468d494657b51ca68c0109491df5fd5490b SHA512 cf871343bd3cd36a0439014a4c558fba137f77a22fa56265d4739b381280c390d6d663529427326ceecadab91086ec5ea451d3f16ff1ed9df758710886cb5576
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.0.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.0.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.1.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index eaf6c4550126..112f081c774e 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.0.tar.xz 8995284 BLAKE2B 792726e81af7eb74193b5ea3eeaf5e36d408b329fbad497dfed92bc8b426b6802c4a841382f4136e24a6c71853eb3c94a9d56cbf1b28a87e0f82e2bc5d21844e SHA512 db11e9425fd90efe50cbe1d59ee863b1d06345a6bb476bf75ac731008970fbb2a92e058c6db5c9f83b084e10953ad3eb333472c5b2596170b6f38475e60dc2c9
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.0.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.1.ebuild
similarity index 100%
rename from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.0.ebuild
rename to kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.1.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 67086cc5e9b6..26765580a836 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 8b8491c090b8..93e4bbda50aa 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,2 +1 @@
-DIST chafa-1.6.1.tar.xz 418720 BLAKE2B 5f6c42311d81bf508f5ec890d72508fd2255e226102b8a7c5c71a9bc1293cd75b08c6b640ca4e6fe9ae34ad47e4e408e25a1aeed7057a5bd823550bea4526f4a SHA512 96cf772638e1a6874d94636a69d6c76d1040d956a16be851ea818292f5b2252867acd0891fede3e030de591b5567d820cf062c5a103a0943a0ea2f2ba34eea77
 DIST chafa-1.8.0.tar.xz 435712 BLAKE2B 15a6e64fff13ac32b2f828a68fb12c96856e175eae83c0396b07cbb2ce71d8c1c8eee67db00880372026fe91eaefac2b34376dee597108ffc07c706cf8c98682 SHA512 15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d
diff --git a/media-gfx/chafa/chafa-1.6.1.ebuild b/media-gfx/chafa/chafa-1.6.1.ebuild
deleted file mode 100644
index aaee185d5da3..000000000000
--- a/media-gfx/chafa/chafa-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-man \
-		$(use_with tools)
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 091c6a79b194..986f4d559f4d 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,2 +1,3 @@
 DIST fotoxx-21.50.tar.gz 8693590 BLAKE2B d3bed82c3e856d6ce2433e0357955f32d462d0dfcf8de673a7c0fbe8aeeea766711c2617730c6a83501b07bd5f5ab60c9d56caeacd6ea938428758a39b5a75b3 SHA512 018735ff4b1fc99a64eccb05af05e9858f9dfce3c6925704f1739c22a49d3209f66d668b21cb6030d971bbe116c978c5d491aaba033683d5ed5268ee0e46ff9e
 DIST fotoxx-21.55.tar.gz 8667304 BLAKE2B 9a324883ba29d8847763985ff33d3e7eaf2a73449fab9c60dee05144c5dc98caf8bef8ce886736fcfae38a7f58526bfb3868da3d3ae2a283ecfabf1bb8858061 SHA512 a207a861b1bc2d8a41ec36a58b1bc9f61db380ae651dee98faf295a1e98730b7fed5a361ab0f09630d8d0f170e58bdf897424ca1d86f27cb669e75f305ea3fb8
+DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
diff --git a/media-gfx/fotoxx/fotoxx-21.60.ebuild b/media-gfx/fotoxx/fotoxx-21.60.ebuild
new file mode 100644
index 000000000000..12a78336fe75
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-21.60.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	media-libs/libchamplain[gtk]
+	virtual/jpeg
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "additional panorama support" media-gfx/hugin
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 008780e5e093..a75fc98a830a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 5ed8afa7afd2..11a1603a87c4 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 951fd0c35a28..04405407841f 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,2 +1 @@
-DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
 DIST xwax-1.8.tar.gz 86268 BLAKE2B 7fbde34e6c1a3508da6ea8230cec7d2663503882182e403bf9bbf2b7327248c1b2e38a21392615a359d30d4a65f558e55346f99bf8f89621a18bcf9e8cf09139 SHA512 db37a16ecc5437f9b085c17e5e645e04b76a18aa7f7d8e8448a2994435596394ea7f2b52a6734194be7cf0b7099995f0f8735c2c547f3f57525339c4dc671d9d
diff --git a/media-sound/xwax/xwax-1.7-r1.ebuild b/media-sound/xwax/xwax-1.7-r1.ebuild
deleted file mode 100644
index ecde10ea92a6..000000000000
--- a/media-sound/xwax/xwax-1.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="https://xwax.org/"
-SRC_URI="https://xwax.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-
-REQUIRED_USE="
-	|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )
-"
-
-DEPEND="
-	media-fonts/dejavu
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	sys-libs/glibc
-	sys-libs/pam
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( media-sound/cdparanoia )
-	fallback? ( media-video/ffmpeg )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/mpg123 )
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/xwax
-"
-
-DOCS=( README CHANGES )
-
-src_prepare() {
-	default
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EPREFIX}/usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax
-	newbin scan xwax-scan
-	newbin import xwax-import
-	doman xwax.1
-
-	dodoc ${DOCS}
-
-	insinto "/etc/security/limits.d"
-	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
-}
-
-pkg_postinst() {
-	elog "Be sure to add any users that will be using ${PN} to the"
-	elog "\"${PN}\" group. Doing so will allow processes that user"
-	elog "runs to request realtime priority."
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 14a67b56f035..fab960b733e9 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
index e0e3a255570a..d1c6330734f4 100644
--- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/media-video/vidify/vidify-2.2.6.ebuild b/media-video/vidify/vidify-2.2.6.ebuild
index d80a08f97932..94b2caead30c 100644
--- a/media-video/vidify/vidify-2.2.6.ebuild
+++ b/media-video/vidify/vidify-2.2.6.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit xdg distutils-r1 optfeature virtualx
 
@@ -68,7 +66,7 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors"
-	elof "and recompile media-video/vlc or media-video/mpv with the missing codecs"
+	elog "and recompile media-video/vlc or media-video/mpv with the missing codecs"
 
 	optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus
 	optfeature "using the Spotify Web API as audio player" dev-python/tekore
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 59c0d6a25733..6f1997ff2b4e 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 26c4ec1514aa..ddaf764ec710 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Oct 2021 05:39:12 +0000
+Wed, 20 Oct 2021 20:08:55 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 26c4ec1514aa..ddaf764ec710 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Oct 2021 05:39:12 +0000
+Wed, 20 Oct 2021 20:08:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8f53a3f2f9cd..21e9b3994fd7 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 aa7bf2af5777..f496c31b5ae1 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/awscli-1.20.65 b/metadata/md5-cache/app-admin/awscli-1.20.65
new file mode 100644
index 000000000000..b5d1e884cd55
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.65
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.65[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.65[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.65.tar.gz -> awscli-1.20.65.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/mongo-tools-100.4.1 b/metadata/md5-cache/app-admin/mongo-tools-100.4.1
index 279f4a4f5bdf..e41889c9cecd 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-100.4.1
+++ b/metadata/md5-cache/app-admin/mongo-tools-100.4.1
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=amd64 ~arm64 ~riscv
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/100.4.1.tar.gz -> mongo-tools-100.4.1.tar.gz
-_md5_=3322edbbaac5ea77cbb7fca70d370918
+_md5_=88826c32e29420ce06759ca69248bcee
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.15 b/metadata/md5-cache/app-admin/mongo-tools-4.2.15
index 87af29c78e20..f1ade9d8b7f3 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-4.2.15
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.15
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.15.tar.gz -> mongo-tools-4.2.15.tar.gz
-_md5_=d4e7794532221211fdff8d33d7fa05cc
+_md5_=7790078b53c0881a2d36e1400027eca4
diff --git a/metadata/md5-cache/app-admin/puppet-7.10.0 b/metadata/md5-cache/app-admin/puppet-7.10.0
deleted file mode 100644
index e3059eee747c..000000000000
--- a/metadata/md5-cache/app-admin/puppet-7.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83919d8bfc870bcf5e6a57ed5a30d47b
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2
deleted file mode 100644
index 1a941aa7fd5e..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=4fe57d617b4b61aecbddc09b71ca25d1
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1 b/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1
deleted file mode 100644
index 9414f7be3d3f..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-7.10.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.10.0-1focal_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=6b585a3670450a3b0a2a6d4c6b775747
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.3.0 b/metadata/md5-cache/app-admin/puppetserver-7.3.0
deleted file mode 100644
index d283eb9c0565..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-7.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.3.0.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44a5418969ad8f63ba51a9b78d6e3aa7
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index f72b10609393..924d945c3485 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/stoken-0.92-r1 b/metadata/md5-cache/app-crypt/stoken-0.92-r2
similarity index 91%
rename from metadata/md5-cache/app-crypt/stoken-0.92-r1
rename to metadata/md5-cache/app-crypt/stoken-0.92-r2
index b6c7d9888824..bc334febec3f 100644
--- a/metadata/md5-cache/app-crypt/stoken-0.92-r1
+++ b/metadata/md5-cache/app-crypt/stoken-0.92-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Software Token for Linux/UNIX
 EAPI=6
 HOMEPAGE=https://github.com/cernekee/stoken
-IUSE=gtk static
+IUSE=gtk static-libs
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/nettle gtk? ( >=x11-libs/gtk+-3.12:3 )
 SLOT=0
 SRC_URI=https://github.com/cernekee/stoken/archive/v0.92.tar.gz -> stoken-0.92.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1fa816da1b9e3526b7504b0046089a9
+_md5_=3ccf8088365a530a3fcdfb7a69c65d33
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 79815af115cf..a3f66792cbfa 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905 b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
index 92d0720270a3..bed0117dac1c 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flexmock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwidtrees[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docker-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/flexmock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwidtrees[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docker-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Terminal User Interface for docker engine
 EAPI=7
 HOMEPAGE=https://github.com/TomasTomecek/sen
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urwidtrees[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docker-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwidtrees[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docker-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TomasTomecek/sen/archive/02e5872ee2905861e1da06ab5174e1a3f41f0e0b.tar.gz -> sen-0.6.1_p20200905.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=504a8b6d322add10d45e7d969bcbd2cf
+_md5_=c163b08a1770738c0a8a9f26f3db9396
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
deleted file mode 100644
index 72fc9169377b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=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] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64
-LICENSE=GPL-2 dtrace? ( CDDL )
-RDEPEND=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] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.22 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f965c66df97e97a4681e33897d2bc40
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-6.1.28
new file mode 100644
index 000000000000..de90d1fd246b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.28
@@ -0,0 +1,15 @@
+BDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.28 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.28 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VirtualBox-6.1.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=517102e6ffb23b16056b5d14a423199f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
similarity index 64%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22
rename to metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
index bc69867da123..e41a60cdfbea 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VBoxGuestAdditions_6.1.22.iso
-_md5_=6f23e298f9ab8601d56e84810d9fcfa2
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VBoxGuestAdditions_6.1.28.iso
+_md5_=9a3ebdc4f46e6d0d0728925a64b6731e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080
deleted file mode 100644
index ed824f0554db..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.22.144080
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL
-RDEPEND==app-emulation/virtualbox-6.1.22*
-RESTRICT=bindist mirror strip
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b60ac2290951628b381f8f53b447e44
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
new file mode 100644
index 000000000000..fd5bed54da16
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL
+RDEPEND==app-emulation/virtualbox-6.1.28*
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/Oracle_VM_VirtualBox_Extension_Pack-6.1.28.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.28.tar.gz
+_md5_=dd4ab2845ea226aae4bd27069e0ffac8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
deleted file mode 100644
index bbccea0fcdc6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VirtualBox-6.1.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
similarity index 89%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
index f4ad4256b361..1499e7f71f56 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
@@ -5,11 +5,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VirtualBox-6.1.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85b58b1b74775adf82cf2f925dcfce04
+_md5_=461efe0d1f7e7c52d3b739d39e645ef7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
new file mode 100644
index 000000000000..b00f3242e67a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.28.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ddbe0a12f0704314ed8f71d00594f8fc
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.2-r1 b/metadata/md5-cache/app-emulation/xen-4.14.3-r1
similarity index 75%
rename from metadata/md5-cache/app-emulation/xen-4.14.2-r1
rename to metadata/md5-cache/app-emulation/xen-4.14.3-r1
index e3f15361b570..d4bc0437ad99 100644
--- a/metadata/md5-cache/app-emulation/xen-4.14.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-4.14.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
 DESCRIPTION=The Xen virtual machine monitor
 EAPI=7
 HOMEPAGE=https://www.xenproject.org
 IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
+KEYWORDS=~amd64 ~arm -x86
 LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.14.2
+PDEPEND=~app-emulation/xen-tools-4.14.3
 REQUIRED_USE=arm? ( debug )
 RESTRICT=test splitdebug strip
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.2/xen-4.14.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.2-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.2-upstream-patches-0.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.3/xen-4.14.3.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.3-upstream-patches-0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa9555134dfe4a169aec482880ac86d8
+_md5_=eb1bf8d4acc366888615e3b0690d2c09
diff --git a/metadata/md5-cache/app-emulation/xen-4.15.0-r1 b/metadata/md5-cache/app-emulation/xen-4.15.0-r1
deleted file mode 100644
index 1e0802ed4966..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.15.0
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.15.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.0-upstream-patches-1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c18f8ef368e2baa576857858c98c96dd
diff --git a/metadata/md5-cache/app-emulation/xen-4.15.1 b/metadata/md5-cache/app-emulation/xen-4.15.1-r1
similarity index 83%
rename from metadata/md5-cache/app-emulation/xen-4.15.1
rename to metadata/md5-cache/app-emulation/xen-4.15.1-r1
index 2194d52ec703..ecf92acdf144 100644
--- a/metadata/md5-cache/app-emulation/xen-4.15.1
+++ b/metadata/md5-cache/app-emulation/xen-4.15.1-r1
@@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.15.1
 REQUIRED_USE=arm? ( debug )
 RESTRICT=test splitdebug strip
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.1/xen-4.15.1.tar.gz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.15.1/xen-4.15.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.15.1-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.1-upstream-patches-0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b4375079955b2fc97bdf3f09077d011
+_md5_=dbc9a286495189fa493a4f1b8059207a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
deleted file mode 100644
index 9ceaa13f9c93..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-misc/pax-utils dev-lang/perl >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.14
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.2/xen-4.14.2.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.2-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.2-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c31ac92b8118ee111fffcb9c7bd99a09
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
deleted file mode 100644
index eba5598c0746..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-misc/pax-utils dev-lang/perl >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.15
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.15.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.15.0-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8367925bd4205dc1d3bbd8e930afa1b8
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.1 b/metadata/md5-cache/app-emulation/xen-tools-4.15.1-r1
similarity index 94%
rename from metadata/md5-cache/app-emulation/xen-tools-4.15.1
rename to metadata/md5-cache/app-emulation/xen-tools-4.15.1-r1
index 71f38fbe9ae3..04aa686411e3 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.1-r1
@@ -11,6 +11,6 @@ RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.15
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.1/xen-4.15.1.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.15.1/xen-4.15.1.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/a3741780fe3535e19e02efa869a7cac481891129.tar.gz -> edk2-a3741780fe3535e19e02efa869a7cac481891129.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-23.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-23.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19123f7cda5510ec1d371cbe48403c89
+_md5_=f7a5ad40753a50251dc5f4c42020e9a8
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 0badab1a5de6..3b72791664fb 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
deleted file mode 100644
index 0d40dc5dbb52..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=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_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Korean Hangul engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
-IUSE=nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=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_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.3/ibus-hangul-1.5.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c6a5afc0b097bb7c984b1d479418084
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
index c96e6aaec2ef..75cb112b056c 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
@@ -5,7 +5,7 @@ DESCRIPTION=Korean Hangul engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=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_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a6304a425a22131ee09c61914ca3cc3e
+_md5_=25a531c524f943a2cc71c0e69a20df57
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12-r1
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12-r1
index e4f015624ca7..2fa667c20f8f 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.12-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.14.12/ibus-typing-booster-2.14.12.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7682e1612c09a3d88af0ade47c3fcd5c
+_md5_=3a397e18cdd0bea187c78a9fc9babdf7
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13-r1
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13-r1
index 3128ff5620f2..7ba3e872ece6 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.14.13/ibus-typing-booster-2.14.13.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a00b3a96070fd1e07bb4d622c98762e
+_md5_=0bd7f444a8a486f4e8e2c2139ef98325
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index f73904de6b18..1381e612b20b 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.4 b/metadata/md5-cache/app-misc/uptimed-0.4.4
index 277f90dfcadd..174ed4431bd2 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.4
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.4
@@ -4,10 +4,10 @@ DEPEND=acct-group/uptimed acct-user/uptimed
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=8
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.4.tar.gz -> uptimed-0.4.4.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5406cecc015a4db2e9ded1afee4378ca
+_md5_=a556a78a68b90e15458a1141e7ce0088
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index adc338ea3edc..e59dfe004c3b 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/ghostscript-gpl-9.54.0-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
index d8c22ef67d47..052e42706cce 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=7
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk +jpeg2k l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.54
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.54-patchset-01.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35904e6c103348a4adb42e076df4ad66
+_md5_=b377a6f1e54c2b16313d5b268b66612c
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0 b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0
new file mode 100644
index 000000000000..82789e7a57a3
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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
+DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext )
+DESCRIPTION=Interpreter for the PostScript language and PDF
+EAPI=8
+HOMEPAGE=https://ghostscript.com/
+IUSE=cups dbus gtk +jpeg2k l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=AGPL-3 CPL-1.0
+RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
+SLOT=0/9.55
+SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostscript-9.55.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.55-patchset-01.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fbbe6c1a6e82f72350509a97d40e68ef
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 5e6ab0de34f1..d9a56fefe045 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/mongodb-4.2.15-r1 b/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
index 0726ee4c81b8..010a0a562495 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.15 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.15.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=150a938ec2a1dbbff9c37ce7716f5114
+_md5_=cb796f299c4e0f4a6329479b51e02ecb
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1 b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
index ef8457cb5caa..bb414d9102ee 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=~amd64 ~arm64 -riscv
+KEYWORDS=amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+),nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82cbb0777b0078b1efebf9ca900d6a76
+_md5_=dfc4fdf02230afc0c75b0790412f64cd
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5b84c18a8518..c5d7211c3394 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_rc2 b/metadata/md5-cache/dev-lang/python-3.10.0_rc2
deleted file mode 100644
index 10ca70fcd5b3..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc2.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=edc97b538c3201dd7ade5b6e454580a1
diff --git a/metadata/md5-cache/dev-lang/python-3.6.15 b/metadata/md5-cache/dev-lang/python-3.6.15
index 6aade9891b59..7d054eba4d34 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.15
+++ b/metadata/md5-cache/dev-lang/python-3.6.15
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tar.xz.asc )
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=21c879cdcbe41db71440b96a828f215f
+_md5_=142e8ba87d4c2aae21c60fc82afce11b
diff --git a/metadata/md5-cache/dev-lang/python-3.7.11_p1 b/metadata/md5-cache/dev-lang/python-3.7.11_p1
deleted file mode 100644
index 16b5923038e6..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.7.11_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.7/3.7m
-SRC_URI=https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.11_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6fabc5d96b656174a0994b6325cbcd5
diff --git a/metadata/md5-cache/dev-lang/python-3.8.12 b/metadata/md5-cache/dev-lang/python-3.8.12
deleted file mode 100644
index 977c0bf66d0e..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.12.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac499d74aa931955f34ff6dbd0310c43
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6_p2 b/metadata/md5-cache/dev-lang/python-3.9.6_p2
deleted file mode 100644
index 40dace45b90f..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.6_p2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1fb22d9ce55a00a4d3b306ace97b5a71
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 53bfba7b030f..e064fc817961 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/libtomcrypt-1.18.2-r2 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r3
similarity index 96%
rename from metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
rename to metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r3
index bb564799ee8b..a717488fa5d9 100644
--- a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
 SLOT=0/1
 SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51c0b1cd099eca401baf7c8e15146747
+_md5_=94bf5dd88851ba467429320a9ebb0df1
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9a824ab845a2..6ff781af345e 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
index f51a76c21375..b24df2ad3069 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz -> ppx_sexp_conv-0.14.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=33b2116948276e1bcafb5752d96f79ef
+_md5_=5f8faeb3af57f35b560cc72224e47015
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
index 792a7a71ede0..1897391a9c23 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz -> ppx_typerep_conv-0.14.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=8bd1e2e6ee68897e90e820220a3f85c0
+_md5_=153c88ce88a81fd53c6f1a861088829e
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
index 3d47e7121feb..6e1c83daac53 100644
--- a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Less indentation and newlines plus sub deparsing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Data-Dumper-Concise
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=32fd82b90d2d286a9ce38df092f5ade3
+_md5_=604acf929e8a0669c54bc947ad09f573
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 25f47f468c14..33aa0060eb79 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4 b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
index 9d91469fd414..6f3ce5ba7b11 100644
--- a/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
+++ b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
@@ -1,6 +1,6 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=>=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl
+DEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike dev-lang/perl
 DESCRIPTION=Perl extension to model fractions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Number-Fraction
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2eb17bfdf09c3a212a0e5ce72eee269f
+_md5_=3bd7c6c20266e59da9ee20cd0deb9798
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1 b/metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1
index 7ab749209044..c7dae6e3af77 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Generate SQL from Perl data structures
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/SQL-Abstract
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=dev-perl/Hash-Merge-0.120.0 virtual/perl-Scalar-List-Utils >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Moo-2.0.1 >=dev-perl/Sub-Quote-2.0.1 >=dev-perl/Test-Deep-0.101.0 >=virtual/perl-Text-Balanced-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Abstract-2.000001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=73472452221fd38c35e83679d0e46c2a
+_md5_=1f49ae75bd0f7b425f99282a3a6aaceb
diff --git a/metadata/md5-cache/dev-python/Faker-9.5.0 b/metadata/md5-cache/dev-python/Faker-9.5.0
new file mode 100644
index 000000000000..47fcea9a689f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-9.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-9.5.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 05f0384ee182..b511a2736b44 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/aesara-2.2.3 b/metadata/md5-cache/dev-python/aesara-2.2.3
new file mode 100644
index 000000000000..2e3caaaa3fd1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.2.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.2.3.tar.gz -> aesara-rel-2.2.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=de767c490864cfb51554697260e7d762
diff --git a/metadata/md5-cache/dev-python/backrefs-5.1 b/metadata/md5-cache/dev-python/backrefs-5.1
new file mode 100644
index 000000000000..4bb5cfa288a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backrefs-5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Wrapper around re or regex that adds additional back references
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/backrefs/ https://pypi.org/project/backrefs/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/backrefs/archive/5.1.tar.gz -> backrefs-5.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=16babb340206c0c52464b8ecb0772479
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.65 b/metadata/md5-cache/dev-python/boto3-1.18.65
new file mode 100644
index 000000000000..61b85e9c7ce0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.65
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.65[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.65[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.65.tar.gz -> boto3-1.18.65.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.65 b/metadata/md5-cache/dev-python/botocore-1.21.65
new file mode 100644
index 000000000000..b39c147e3b17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.65
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.65.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/ghp-import-2.0.2 b/metadata/md5-cache/dev-python/ghp-import-2.0.2
new file mode 100644
index 000000000000..30083b44bbcc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ghp-import-2.0.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Copy your docs directly to the gh-pages branch
+EAPI=8
+HOMEPAGE=https://github.com/c-w/ghp-import
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/g/ghp-import/ghp-import-2.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d40c2245db1954b9173e59150f21d89
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.27.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.27.0
new file mode 100644
index 000000000000..c9ad56a809f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.27.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.27.0.tar.gz -> google-api-python-client-2.27.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4fdc7ac473e241b51f5fde3ed5f346e
diff --git a/metadata/md5-cache/dev-python/greenstalk-2.0.0 b/metadata/md5-cache/dev-python/greenstalk-2.0.0
new file mode 100644
index 000000000000..f403016de9d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/greenstalk-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-misc/beanstalkd ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python 3 client for the beanstalkd work queue
+EAPI=8
+HOMEPAGE=https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/justinmayhew/greenstalk/archive/v2.0.0.tar.gz -> greenstalk-2.0.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7576075399696013204f8ede482ed296
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.1.1 b/metadata/md5-cache/dev-python/jsonschema-4.1.1
new file mode 100644
index 000000000000..fa6646198a63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-4.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonschema/jsonschema-4.1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=85f85ed336c679aa951e73beacbe265f
diff --git a/metadata/md5-cache/dev-python/kconfiglib-14.1.0 b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
index 5ff3fa849969..10f56c13ff8c 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-14.1.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A flexible Python Kconfig implementation
 EAPI=7
 HOMEPAGE=https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v14.1.0.tar.gz -> kconfiglib-14.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58cbe8e14376e666b9b2ffe38e454629
+_md5_=5c4a7ef820fe1817d317dfa7026fd705
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.2.3 b/metadata/md5-cache/dev-python/mkdocs-1.2.3
new file mode 100644
index 000000000000..39dcd86be838
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-1.2.3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/mdx_gh_links[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mdx_gh_links[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mdx_gh_links[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Project documentation with Markdown
+EAPI=8
+HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.2.3.tar.gz -> mkdocs-1.2.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b7df5a1d78bdac7f3112bdfe35543a54
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.3.4 b/metadata/md5-cache/dev-python/mkdocs-material-7.3.4
new file mode 100644
index 000000000000..48ac1aeda065
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.3.4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pymdown-extensions-9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.3.4.tar.gz -> mkdocs-material-7.3.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2ae600fe8ab51c271ecea9bc57173f6
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0
new file mode 100644
index 000000000000..f574fce7c840
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being written to disk
+EAPI=8
+HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsmin-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3435bf6c0cbf4844ac87fb3a71f5d99c
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.5.4 b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.5.4
new file mode 100644
index 000000000000..718288124405
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.5.4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Custom alterations based on Mkdocs-Material
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras https://pypi.org/project/mkdocs-pymdownx-material-extras
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-material-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/archive/1.5.4.tar.gz -> mkdocs_pymdownx_material_extras-1.5.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7eb3f7456b29e136a76bbe3808bcb117
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.5 b/metadata/md5-cache/dev-python/notebook-6.4.5
new file mode 100644
index 000000000000..9d22829ab4e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-6.4.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-unixsocket[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=8
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/notebook/notebook-6.4.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2cbe2da7162cb48ec802bd12120bf52c
diff --git a/metadata/md5-cache/dev-python/pdoc3-0.10.0 b/metadata/md5-cache/dev-python/pdoc3-0.10.0
index 834501fff8df..765805f19dbe 100644
--- a/metadata/md5-cache/dev-python/pdoc3-0.10.0
+++ b/metadata/md5-cache/dev-python/pdoc3-0.10.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc3/pdoc3-0.10.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9665b1b0d82bc5bf5c7d912389e17c7c
+_md5_=b41741656cfe5a357911bae5ce3d5de9
diff --git a/metadata/md5-cache/dev-python/pymongo-3.12.1 b/metadata/md5-cache/dev-python/pymongo-3.12.1
new file mode 100644
index 000000000000..8183a2067a2b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymongo-3.12.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-db/mongodb-2.6.0 ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( kerberos? ( dev-python/pykerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Python driver for MongoDB
+EAPI=8
+HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/
+IUSE=doc kerberos doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~hppa ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.12.1.tar.gz -> mongo-python-driver-3.12.1.tar.gz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=558e466560c7b52a5f058431cfeaf45c
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.2.4 b/metadata/md5-cache/dev-python/python-lsp-server-1.2.4
new file mode 100644
index 000000000000..69c48eacf150
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.2.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/flake8-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/flake8-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python Language Server for the Language Server Protocol
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server
+IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/flake8-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.2.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f14cd39bd2d44acb06851ae15e9bd5be
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2 b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
index 99158372b435..fa5834e6b8c2 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
+++ b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/qtsass[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.7[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( dev-python/qtsass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/QtPy-1.7[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=A dark style sheet for QtWidgets application
 EAPI=7
 HOMEPAGE=https://github.com/ColinDuquesnoy/QDarkStyleSheet
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v3.0.2.tar.gz -> qdarkstyle-3.0.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=74a17c6902adb494b4629c64c134fae9
+_md5_=5295c7b0030db7a758e3050418c600ff
diff --git a/metadata/md5-cache/dev-python/seaborn-0.11.2 b/metadata/md5-cache/dev-python/seaborn-0.11.2
new file mode 100644
index 000000000000..d64f069feb7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/seaborn-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Statistical data visualization
+EAPI=8
+HOMEPAGE=https://seaborn.pydata.org https://github.com/mwaskom/seaborn
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/seaborn/seaborn-0.11.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=619857a577be61a45b8043eb0935a97d
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3
deleted file mode 100644
index 67583140df98..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=<dev-python/setuptools_scm-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( <dev-python/setuptools_scm-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A setuptools_scm plugin for git archives
-EAPI=7
-HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=<dev-python/setuptools_scm-6.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e787a5b35fe44fe598e2f8b0efe0f3c8
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
new file mode 100644
index 000000000000..95174fb462be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A setuptools_scm plugin for git archives
+EAPI=7
+HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 arm ~arm64 ~ppc64 ~riscv x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=226d7c293bb922a43eab92a56246c7c0
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.26 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.26
new file mode 100644
index 000000000000..95a28d350c57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.26.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=61d89a9a8ac013484dde246b8b182102
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.3 b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
index 1d38774ca4cd..94f24bcf668a 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.3
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tree widgets for urwid
 EAPI=7
 HOMEPAGE=https://github.com/pazz/urwidtrees
-IUSE=doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.3.tar.gz -> urwidtrees-1.0.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=943c2d102734a06814c6790d0746d71b
+_md5_=2040f87ca1844871835eacb35476f9f5
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index dc8a371f8573..970ec14219c8 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211019
similarity index 96%
rename from metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015
rename to metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211019
index deb0a942cc50..cb2d76ab5807 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211019
@@ -5,11 +5,12 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwebchannel-5.15.2*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.2* ) geolocation? ( =dev-qt/qtpositioning-5.15.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.2*[widgets] =dev-qt/qtwidgets-5.15.2* )
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20211015.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20211019.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=6321c903b685c3beeeafb49abf0bc026
+_md5_=1797d3a1ac529b5e1e93685498669572
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3e087762400e..5498f1aa60f8 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index 95f467a5a9d7..338091a45bd7 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=7
 HOMEPAGE=https://toland.github.com/patron/
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b4101de9412c60b39bb7fefe5bba70f
+_md5_=635f123be43cf1914dab4cde1e75e2c9
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 720b6203c77c..a96f7b6edcc7 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r3 b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r3
new file mode 100644
index 000000000000..affe92737f7d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=man? ( dev-util/gperf ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:* ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=7
+HOMEPAGE=https://invent.kde.org/network/kio-extras
+IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:* ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kio-extras-21.04.3.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=45d49940e2f8cbbf5d26456e9cf67eb3
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.08.2 b/metadata/md5-cache/kde-apps/kio-extras-21.08.2-r1
similarity index 98%
rename from metadata/md5-cache/kde-apps/kio-extras-21.08.2
rename to metadata/md5-cache/kde-apps/kio-extras-21.08.2-r1
index cdf52d682eac..2409316d09d3 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-21.08.2
+++ b/metadata/md5-cache/kde-apps/kio-extras-21.08.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kio-extras-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7abbddbdacc6aed89e84bcc05991a528
+_md5_=0ff63bed3c0a7fa27e555c546319fb76
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index d5ad3e814496..9ec4b24f7ee8 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.23.0 b/metadata/md5-cache/kde-plasma/bluedevil-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/bluedevil-5.23.0
rename to metadata/md5-cache/kde-plasma/bluedevil-5.23.1
index 842053817111..ad982c78b952 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.23.0
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.23.1
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/bluedevil-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/bluedevil-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a1d91672b8e285d76e3ee5fca8ec4c41
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.23.0 b/metadata/md5-cache/kde-plasma/breeze-5.23.1
similarity index 91%
rename from metadata/md5-cache/kde-plasma/breeze-5.23.0
rename to metadata/md5-cache/kde-plasma/breeze-5.23.1
index 05e6cb734c97..da9a5e437051 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.23.0
+++ b/metadata/md5-cache/kde-plasma/breeze-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.86.0:5 dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.86.0:5 dev-qt/qtcore:5
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/breeze
 IUSE=X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-frameworks/breeze-icons-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/breeze-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4f33e07eb88b329fecca3717713da1aa
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.23.0 b/metadata/md5-cache/kde-plasma/breeze-grub-5.23.1
similarity index 82%
rename from metadata/md5-cache/kde-plasma/breeze-grub-5.23.0
rename to metadata/md5-cache/kde-plasma/breeze-grub-5.23.1
index cf2bb1fd84a1..f380c897c885 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.23.0
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.23.1
@@ -5,6 +5,6 @@ HOMEPAGE=https://kde.org/plasma-desktop
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/breeze-grub-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-grub-5.23.1.tar.xz
 _eclasses_=kde.org	f95aaca4085d2d633c2b76abfd72208f
 _md5_=8888677d5f9ff2cb319575318c6e0dc9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.0 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1
similarity index 91%
rename from metadata/md5-cache/kde-plasma/breeze-gtk-5.23.0
rename to metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1
index 1a189420c5bd..55d56b65a012 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.0
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.23.0:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.23.1:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-qt/qtcore:5
 DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/breeze-gtk-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-gtk-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e0003a4cb0616a2b2466f956246d95a1
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.0 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1
similarity index 92%
rename from metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.0
rename to metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1
index 127bebfa8b21..6c703b9144c3 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.0
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/breeze-plymouth-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-plymouth-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b7c40ad78c6c268f8c2e28e79e8b352b
diff --git a/metadata/md5-cache/kde-plasma/discover-5.23.0 b/metadata/md5-cache/kde-plasma/discover-5.23.1
similarity index 98%
rename from metadata/md5-cache/kde-plasma/discover-5.23.0
rename to metadata/md5-cache/kde-plasma/discover-5.23.1
index 3bda87133306..ae101bd5ba40 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.23.0
+++ b/metadata/md5-cache/kde-plasma/discover-5.23.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/discover-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/discover-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1972f010ed91559addc14a517dbe2e6f
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.23.0 b/metadata/md5-cache/kde-plasma/drkonqi-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/drkonqi-5.23.0
rename to metadata/md5-cache/kde-plasma/drkonqi-5.23.1
index 5cff6a3cb45f..b78ba239d565 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.23.0
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/drkonqi-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/drkonqi-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=58dd8150fc630f24874adc0556852c00
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.0 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.0
rename to metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1
index 9daab8ae5453..3922ab46dc96 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kactivitymanagerd-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kactivitymanagerd-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=460617b5842156e7986d53d998337c78
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.0 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.0
rename to metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1
index 3449d0828089..5f5a34b4995a 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
 IUSE=kdesu X test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=kdesu? ( X )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kde-cli-tools-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kde-cli-tools-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a68708dd0ecd88e42d2c032bbf3fe21a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.0 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1
similarity index 87%
rename from metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.0
rename to metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1
index 13daf8b1fb42..019a73b240d0 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 x11-libs/gtk+:3 dev-qt/qtcore:5
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/gtk+:3 dev-qt/qtcore:5
 DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.23.0:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.23.1:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kde-gtk-config-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kde-gtk-config-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4783dbd2ebb1533e79b20978fb4ded32
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.23.0 b/metadata/md5-cache/kde-plasma/kdecoration-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kdecoration-5.23.0
rename to metadata/md5-cache/kde-plasma/kdecoration-5.23.1
index 7a1c9e1d4eb7..f9685becd465 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.23.1
@@ -10,6 +10,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kdecoration-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kdecoration-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a199f7c472ac2e7b4bb1a5f16bba3a3b
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.0 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.0
rename to metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1
index a62739235e60..3b408d6eafb0 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1
@@ -7,9 +7,9 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=share webengine test debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kdeplasma-addons-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kdeplasma-addons-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=67d98292b40f449cf549ff05b6aedf7a
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.23.0 b/metadata/md5-cache/kde-plasma/kgamma-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kgamma-5.23.0
rename to metadata/md5-cache/kde-plasma/kgamma-5.23.1
index d821394792d4..4b2ebc59267f 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kgamma5-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kgamma5-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6e9320c3f1ee6ceff47bc5e48c67ec3e
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.23.0 b/metadata/md5-cache/kde-plasma/khotkeys-5.23.1
similarity index 90%
rename from metadata/md5-cache/kde-plasma/khotkeys-5.23.0
rename to metadata/md5-cache/kde-plasma/khotkeys-5.23.1
index dae608b66006..8d32201bb0c9 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.23.0
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/khotkeys-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/khotkeys-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2f544151b0adfcdf4bbf8c6b8736ac81
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.23.0 b/metadata/md5-cache/kde-plasma/kinfocenter-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/kinfocenter-5.23.0
rename to metadata/md5-cache/kde-plasma/kinfocenter-5.23.1
index 081be0e45ec5..9f12b7a99265 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.23.1
@@ -7,9 +7,9 @@ HOMEPAGE=https://userbase.kde.org/KInfoCenter
 IUSE=gles2-only ieee1394 +opengl +pci usb wayland +X debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 >=kde-plasma/systemsettings-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/systemsettings-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=opengl? ( X ) wayland? ( || ( opengl gles2-only ) )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kinfocenter-5.23.0.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kinfocenter-5.23.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3ec5dff78f30e7f3365f18e35fcde003
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.23.0 b/metadata/md5-cache/kde-plasma/kmenuedit-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/kmenuedit-5.23.0
rename to metadata/md5-cache/kde-plasma/kmenuedit-5.23.1
index 84cb4e1edbbe..a64f4ccfe9b3 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kmenuedit-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kmenuedit-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=21bd36c4407a82b9de7a24157cdbde28
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.23.0 b/metadata/md5-cache/kde-plasma/kscreen-5.23.1
similarity index 89%
rename from metadata/md5-cache/kde-plasma/kscreen-5.23.0
rename to metadata/md5-cache/kde-plasma/kscreen-5.23.1
index ff85ffa8578e..d4a2fc4a4bcc 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma screen management
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kscreen-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kscreen-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=70b6ea386107397aad573f7798c26c43
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.0 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kscreenlocker-5.23.0
rename to metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1
index 3fe0a0fb050e..acf2d77893c8 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.1:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=+pam test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.23.0:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.1:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kscreenlocker-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kscreenlocker-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=18c33b1371b44fb7799491cb4025604b
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.0 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/ksshaskpass-5.23.0
rename to metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1
index 8b543eebabca..a2a87af14321 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.0
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/ksshaskpass-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/ksshaskpass-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7042fc4702487f9f3b2f7fb0a06ce2c3
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.23.0 b/metadata/md5-cache/kde-plasma/ksystemstats-5.23.1
similarity index 91%
rename from metadata/md5-cache/kde-plasma/ksystemstats-5.23.0
rename to metadata/md5-cache/kde-plasma/ksystemstats-5.23.1
index edd7aecaa7ec..a58d49061eac 100644
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.23.0
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Plugin-based system monitoring daemon
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=networkmanager test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/ksystemstats-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/ksystemstats-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e7099f4aec180e22f7925678c99cf9e8
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.0 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/kwallet-pam-5.23.0
rename to metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1
index 0190f926d17d..f1a3eb37842d 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kwallet-pam-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwallet-pam-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=543bf089d5e5110c2c8c064d1bf3c74d
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.0 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kwayland-integration-5.23.0
rename to metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1
index 516939f4cfee..12195452fb8e 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kwayland-integration-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwayland-integration-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=234a28835195781766db5bfcb7e802f1
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.23.0 b/metadata/md5-cache/kde-plasma/kwayland-server-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwayland-server-5.23.0
rename to metadata/md5-cache/kde-plasma/kwayland-server-5.23.1
index 315f7ce9f93b..32f46b355a87 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.23.1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kwayland-server-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwayland-server-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=20b0aae6450cc0dc1d4a1e622b372b67
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.23.0 b/metadata/md5-cache/kde-plasma/kwin-5.23.1
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kwin-5.23.0
rename to metadata/md5-cache/kde-plasma/kwin-5.23.1
index 0073e0e95907..e571a6106ef0 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kwin-5.23.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 >=kde-plasma/kdecoration-5.23.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 >=kde-plasma/kwayland-server-5.23.0:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.23.0:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 >=kde-plasma/kdecoration-5.23.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 >=kde-plasma/kwayland-server-5.23.0:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kwin-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwin-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6db4891996355a88739656871e5a982d
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.23.0 b/metadata/md5-cache/kde-plasma/kwrited-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kwrited-5.23.0
rename to metadata/md5-cache/kde-plasma/kwrited-5.23.1
index 48f083fd8757..ed035f88fae6 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.23.0
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/kwrited-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwrited-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f7aa01fe0888b48ceec9944bb453e0b3
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.0 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.0
rename to metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1
index 961f43dbab1b..8e6bc2431a90 100644
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.0
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/layer-shell-qt-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/layer-shell-qt-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b80afbdc6c661b8b52ad398d16fff457
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.23.0 b/metadata/md5-cache/kde-plasma/libkscreen-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/libkscreen-5.23.0
rename to metadata/md5-cache/kde-plasma/libkscreen-5.23.1
index cad22fb762f0..fbfa4390b287 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.23.0
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.23.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.23.0/libkscreen-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/libkscreen-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b77e1dd0a296a1878d0e5a8fc2a58246
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.23.0 b/metadata/md5-cache/kde-plasma/libksysguard-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/libksysguard-5.23.0
rename to metadata/md5-cache/kde-plasma/libksysguard-5.23.1
index f0670bcc79c7..63f1204c09f8 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.23.0
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.23.1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.23.0/libksysguard-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/libksysguard-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b80d8d47d8d6570de716d3c6fb1cdf7c
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.23.0 b/metadata/md5-cache/kde-plasma/libkworkspace-5.23.1
similarity index 85%
rename from metadata/md5-cache/kde-plasma/libkworkspace-5.23.0
rename to metadata/md5-cache/kde-plasma/libkworkspace-5.23.1
index 0b4e3ccff651..96b31ecf6a1f 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.23.0
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.86.0:5 >=kde-plasma/kwin-5.23.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-workspace-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e903c2bcbc2bc6f1b3adcafed81e80d4
diff --git a/metadata/md5-cache/kde-plasma/milou-5.23.0 b/metadata/md5-cache/kde-plasma/milou-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/milou-5.23.0
rename to metadata/md5-cache/kde-plasma/milou-5.23.1
index 8644318d3122..3682d0ebad8e 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.23.0
+++ b/metadata/md5-cache/kde-plasma/milou-5.23.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/milou-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/milou-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=786c6b7d5a076a5a760277a0cf503bd0
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.23.0 b/metadata/md5-cache/kde-plasma/oxygen-5.23.1
similarity index 90%
rename from metadata/md5-cache/kde-plasma/oxygen-5.23.0
rename to metadata/md5-cache/kde-plasma/oxygen-5.23.1
index d4cc9a0bc230..1330dbf132a0 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.23.0
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) >=kde-frameworks/kservice-5.86.0:5 dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) >=kde-frameworks/kservice-5.86.0:5 dev-qt/qtcore:5
 DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/oxygen
 IUSE=wayland debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.23.0:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/oxygen-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/oxygen-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ea8939355bb79c85fd2255b372d9268b
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1
index 63c9bdb27b7a..5fe194002870 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.0:5 dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.1:5 dev-qt/qtcore:5
 DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-browser-integration-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-browser-integration-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=466e031f4e6d58eb0e5598bb52d82318
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1
similarity index 93%
rename from metadata/md5-cache/kde-plasma/plasma-desktop-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1
index 3b6c3fb7d4ea..7621138fe387 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 >=kde-plasma/plasma-workspace-5.23.0:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma desktop
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 >=kde-plasma/plasma-workspace-5.23.0:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 >=kde-plasma/oxygen-5.23.0:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/oxygen-5.23.1:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-desktop-5.23.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-desktop-5.23.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=968b842dc2efc32e9328afe1ebc3a13e
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-disks-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-disks-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-disks-5.23.1
index 3780310c9b3d..b0aeca2c7764 100644
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-disks-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-disks-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f84ade472bc5d40c7ae04c21c861beeb
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-firewall-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1
index 0b93a878de6c..0b331c1095ed 100644
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 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_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-firewall-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-firewall-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c736633a08db8e257fbfea960719a841
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-integration-5.23.1
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-integration-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-integration-5.23.1
index 77168ec74bd5..63446cf12591 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.23.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
 DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-integration-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-integration-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dcffcf6b8d5ed3e8e061a7aff1a646ea
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-meta-5.23.0
deleted file mode 100644
index 77e8e8ed9637..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.23.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop/
-IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.23.0:5 >=kde-plasma/kactivitymanagerd-5.23.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 >=kde-plasma/kdecoration-5.23.0:5 >=kde-plasma/kdeplasma-addons-5.23.0:5 >=kde-plasma/kgamma-5.23.0:5 >=kde-plasma/khotkeys-5.23.0:5 >=kde-plasma/kinfocenter-5.23.0:5 >=kde-plasma/kmenuedit-5.23.0:5 >=kde-plasma/kscreen-5.23.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 >=kde-plasma/ksshaskpass-5.23.0:5 >=kde-plasma/ksystemstats-5.23.0:5 >=kde-plasma/kwayland-integration-5.23.0:5 >=kde-plasma/kwayland-server-5.23.0:5 >=kde-plasma/kwin-5.23.0:5 >=kde-plasma/kwrited-5.23.0:5 >=kde-plasma/layer-shell-qt-5.23.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=kde-plasma/milou-5.23.0:5 >=kde-plasma/oxygen-5.23.0:5 >=kde-plasma/plasma-desktop-5.23.0:5 >=kde-plasma/plasma-integration-5.23.0:5 >=kde-plasma/plasma-systemmonitor-5.23.0:5 >=kde-plasma/plasma-workspace-5.23.0:5 >=kde-plasma/polkit-kde-agent-5.23.0:5 >=kde-plasma/powerdevil-5.23.0:5 >=kde-plasma/systemsettings-5.23.0:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.23.0:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.23.0:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.23.0:5 ) crypt? ( >=kde-plasma/plasma-vault-5.23.0:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.23.0:5 ) discover? ( >=kde-plasma/discover-5.23.0:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.23.0:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.23.0:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.23.0:5 >=kde-plasma/kde-gtk-config-5.23.0:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.23.0:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.23.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.23.0:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.23.0:5 >=kde-plasma/plymouth-kcm-5.23.0:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.23.0:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.23.0:5 ) smart? ( >=kde-plasma/plasma-disks-5.23.0:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.23.0:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.23.0:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.23.0:5 ) accessibility? ( app-accessibility/orca )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=aeceaf88c206bc8aa10618ba977f82e5
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1
new file mode 100644
index 000000000000..551772889aad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop/
+IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kactivitymanagerd-5.23.1:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kdeplasma-addons-5.23.1:5 >=kde-plasma/kgamma-5.23.1:5 >=kde-plasma/khotkeys-5.23.1:5 >=kde-plasma/kinfocenter-5.23.1:5 >=kde-plasma/kmenuedit-5.23.1:5 >=kde-plasma/kscreen-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/ksshaskpass-5.23.1:5 >=kde-plasma/ksystemstats-5.23.1:5 >=kde-plasma/kwayland-integration-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/kwrited-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/milou-5.23.1:5 >=kde-plasma/oxygen-5.23.1:5 >=kde-plasma/plasma-desktop-5.23.1:5 >=kde-plasma/plasma-integration-5.23.1:5 >=kde-plasma/plasma-systemmonitor-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=kde-plasma/polkit-kde-agent-5.23.1:5 >=kde-plasma/powerdevil-5.23.1:5 >=kde-plasma/systemsettings-5.23.1:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.23.1:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.23.1:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.23.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.23.1:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.23.1:5 ) discover? ( >=kde-plasma/discover-5.23.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.23.1:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.23.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.23.1:5 >=kde-plasma/kde-gtk-config-5.23.1:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.23.1:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.23.1:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.23.1:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.23.1:5 >=kde-plasma/plymouth-kcm-5.23.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.23.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.23.1:5 ) smart? ( >=kde-plasma/plasma-disks-5.23.1:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.23.1:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.23.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.23.1:5 ) accessibility? ( app-accessibility/orca )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=aeceaf88c206bc8aa10618ba977f82e5
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-nm-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-nm-5.23.1
index 8c7b54ac4e63..4cf8f26381c8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.23.1
@@ -7,9 +7,9 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=modemmanager openconnect teamd debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-nm-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-nm-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ba7e64c19c901a974bc44f1bd77d7ff1
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-pa-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-pa-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-pa-5.23.1
index 9d3d7760698f..6fa63fc8bb06 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-pa-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-pa-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cd3ccce52ec8a72e0a7d8992e7859583
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-sdk-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1
index 3dd2f8f84207..395d03fd2a56 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-sdk-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-sdk-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=da6700bb8755307e56e734865e407ef9
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1
similarity index 88%
rename from metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1
index 9ea55e69a47f..cb1818aebb92 100644
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 dev-qt/qtcore:5
 DESCRIPTION=Monitor system sensors, process information and other system resources
 EAPI=8
 HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/ksystemstats-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/ksystemstats-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-systemmonitor-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-systemmonitor-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=de38d01bfc1a98b4cabb6a4300729b83
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1
index 3aca3c903036..4209f3b71dc6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1
@@ -10,6 +10,6 @@ LICENSE=|| ( GPL-2 GPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-thunderbolt-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-thunderbolt-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b09b8f86bc79489ae0e48ecd38611ce5
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-vault-5.23.1
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-vault-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-vault-5.23.1
index df0113782062..db905c0e64a8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
 DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-vault-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-vault-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3282524bf8fdf656528d9d7c549b58fa
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1
similarity index 88%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1
index 33767cdbf013..bc25e733fda5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 >=kde-plasma/kwin-5.23.0:5 >=kde-plasma/layer-shell-qt-5.23.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma workspace
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.23.0:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.0:5 >=kde-plasma/kscreenlocker-5.23.0:5 >=kde-plasma/kwin-5.23.0:5 >=kde-plasma/layer-shell-qt-5.23.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=kde-plasma/libksysguard-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/milou-5.23.0:5 >=kde-plasma/plasma-integration-5.23.0:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/milou-5.23.1:5 >=kde-plasma/plasma-integration-5.23.1:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-workspace-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e0033098c27338d594d7c2463f1f1ead
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1
similarity index 89%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.0
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1
index 9911c978b58e..405a218d3b22 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1
@@ -6,6 +6,6 @@ HOMEPAGE=https://kde.org/plasma-desktop
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-workspace-wallpapers-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-wallpapers-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f707c667fe08eac06576d3a5fed929ee
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.0 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1
similarity index 93%
rename from metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.0
rename to metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1
index ddf191352365..6225b9cff040 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.0
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.23.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plymouth-kcm-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plymouth-kcm-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6425d934e036af764e97225efb4c50b5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.0 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1
similarity index 95%
rename from metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.0
rename to metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1
index ce2836ba0898..a2e49f1cb3cb 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.0
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/polkit-kde-agent-1-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/polkit-kde-agent-1-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=187c8ef7b3346402d5c1f00f9c798ad1
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.23.0 b/metadata/md5-cache/kde-plasma/powerdevil-5.23.1
similarity index 92%
rename from metadata/md5-cache/kde-plasma/powerdevil-5.23.0
rename to metadata/md5-cache/kde-plasma/powerdevil-5.23.1
index 5d1c6198d800..270024888492 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.23.0
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control caps +wireless debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.0:5 >=kde-plasma/libkworkspace-5.23.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.0:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.1:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/powerdevil-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/powerdevil-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=336b8b513f7e024165d1faada7e62538
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.0 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/sddm-kcm-5.23.0
rename to metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1
index 7d64216288a4..8ce38e371079 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.0
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-plasma/kde-cli-tools-5.23.0:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-plasma/kde-cli-tools-5.23.1:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/sddm-kcm-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/sddm-kcm-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c2af6a8224ab4c9f044f0c64ea2b322b
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.23.0 b/metadata/md5-cache/kde-plasma/systemsettings-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/systemsettings-5.23.0
rename to metadata/md5-cache/kde-plasma/systemsettings-5.23.1
index 0a15c7bd4f30..82590edb4be4 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.23.0
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.23.1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 dev-qt/qtcore:5
 DESCRIPTION=Control Center to configure KDE Plasma desktop
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/systemsettings-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/systemsettings-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7a0809fd1f0d01e95aa0415b876fc4fe
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.0 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1
similarity index 96%
rename from metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.0
rename to metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1
index 229be05b0651..ba8a81dae073 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.0
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/xdg-desktop-portal-kde-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/xdg-desktop-portal-kde-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=89933c1d0124314e68b2bc54f8e68f88
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.0 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1
similarity index 94%
rename from metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.0
rename to metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1
index 05f68914b6ad..6446aa80991c 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.0
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.23.0/plasma-workspace-5.23.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8db3aa4f21e8858bac743389ae3ef689
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 979412b1f570..89828e08bd35 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/chafa-1.6.1 b/metadata/md5-cache/media-gfx/chafa-1.6.1
deleted file mode 100644
index 522d95ad2fe4..000000000000
--- a/metadata/md5-cache/media-gfx/chafa-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
-EAPI=8
-HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
-IUSE=+tools
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-SLOT=0
-SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.1.tar.xz
-_md5_=a03e54ae020825c0c07b59a5cb79e494
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.60 b/metadata/md5-cache/media-gfx/fotoxx-21.60
new file mode 100644
index 000000000000..68d86d7be886
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.60
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3
+DESCRIPTION=Program for improving image files made with a digital camera
+EAPI=7
+HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.60.tar.gz
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4dea35aa773696ef57af1e6798530643
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index dad3f2a3bd36..5916ef8503d5 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/mpd-0.22.11 b/metadata/md5-cache/media-sound/mpd-0.22.11
index 758ad173950d..5452318abf3e 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.11
+++ b/metadata/md5-cache/media-sound/mpd-0.22.11
@@ -5,7 +5,7 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd test tidal twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.11.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff5cf5365a039c1aa49f384d56cb8a9c
+_md5_=a733d6d6628e3a0f27bd6804ee2fec37
diff --git a/metadata/md5-cache/media-sound/xwax-1.7-r1 b/metadata/md5-cache/media-sound/xwax-1.7-r1
deleted file mode 100644
index e7fb7b7e0295..000000000000
--- a/metadata/md5-cache/media-sound/xwax-1.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 )
-DESCRIPTION=Digital vinyl emulation software
-EAPI=7
-HOMEPAGE=https://xwax.org/
-IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 ) acct-group/xwax
-REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
-SLOT=0
-SRC_URI=https://xwax.org/releases/xwax-1.7.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=531cb650ca5f8f4f3c20ed6ea226b649
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 188c639cda39..a679babd9ec9 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vidify-2.2.6 b/metadata/md5-cache/media-video/vidify-2.2.6
index 57089b8373cf..10fb286f2946 100644
--- a/metadata/md5-cache/media-video/vidify-2.2.6
+++ b/metadata/md5-cache/media-video/vidify-2.2.6
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,webengine,python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/lyricwikia[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dbus? ( dev-python/pydbus[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !dbus? ( dev-python/tekore[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mpv? ( dev-python/python-mpv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vlc? ( dev-python/python-vlc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/QtPy[gui,webengine,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/lyricwikia[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dbus? ( dev-python/pydbus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dbus? ( dev-python/tekore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mpv? ( dev-python/python-mpv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) vlc? ( dev-python/python-vlc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Watch music videos in real time for the songs playing on your device
 EAPI=7
 HOMEPAGE=https://vidify.org
-IUSE=dbus vlc mpv zeroconf test python_targets_python3_8 python_targets_python3_9 test
+IUSE=dbus vlc mpv zeroconf test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=~amd64
 LICENSE=LGPL-3
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,webengine,python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/lyricwikia[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dbus? ( dev-python/pydbus[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !dbus? ( dev-python/tekore[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mpv? ( dev-python/python-mpv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vlc? ( dev-python/python-vlc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( vlc mpv zeroconf ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/QtPy[gui,webengine,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/lyricwikia[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/youtube-dl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dbus? ( dev-python/pydbus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dbus? ( dev-python/tekore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mpv? ( dev-python/python-mpv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) vlc? ( dev-python/python-vlc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( vlc mpv zeroconf ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vidify/vidify/archive/v2.2.6.tar.gz -> vidify-2.2.6.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5f999d09040413764ae87b57ff394f89
+_md5_=be0aee5fb23b6537f069b80692777d38
diff --git a/metadata/md5-cache/media-video/vidify-audiosync-0.3.0 b/metadata/md5-cache/media-video/vidify-audiosync-0.3.0
index 1ac52702ee85..8b7d9974f9bc 100644
--- a/metadata/md5-cache/media-video/vidify-audiosync-0.3.0
+++ b/metadata/md5-cache/media-video/vidify-audiosync-0.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-util/cmake ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-util/cmake ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Audio synchronization feature for vidify
 EAPI=7
 HOMEPAGE=https://vidify.org
-IUSE=debug test python_targets_python3_8 python_targets_python3_9
+IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=LGPL-3
-RDEPEND=media-sound/pulseaudio media-video/ffmpeg[openssl] media-video/vidify[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/fftw debug? ( sci-visualization/gnuplot ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=media-sound/pulseaudio media-video/ffmpeg[openssl] media-video/vidify[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/fftw debug? ( sci-visualization/gnuplot ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vidify/old-audiosync/archive/v0.3.0.tar.gz -> vidify-audiosync-0.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fcc869b7096ab3cd13bdf25ef0ce247
+_md5_=d91237a1c86efe8ea88506f75ae453d9
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index aef7565fcf13..2ca0b5b4f230 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/icinga2-2.13.0 b/metadata/md5-cache/net-analyzer/icinga2-2.13.0
deleted file mode 100644
index 69609258f992..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=7
-HOMEPAGE=https://icinga.com/
-IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
-REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.0.tar.gz -> icinga2-2.13.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99c0886f02982c035de1f069a8f09145
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f897e10ae833..b3b4d19d5e4b 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/inspircd-3.11.0 b/metadata/md5-cache/net-irc/inspircd-3.11.0
index eb2d8e751d23..05c2c28682ec 100644
--- a/metadata/md5-cache/net-irc/inspircd-3.11.0
+++ b/metadata/md5-cache/net-irc/inspircd-3.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=8
 HOMEPAGE=https://www.inspircd.org/
 IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v3.11.0.tar.gz -> inspircd-3.11.0.tar.gz https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-3.11.0-fix-path-builds.patch.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=91a8472884da40ce104066b22ef2cd40
+_md5_=32a3e45498b3ccef7f4a05d365c54dc0
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5479af6245c7..8757dc7932e4 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
index 88a1aac7068b..4fbde21084e6 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
+++ b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.1/nghttp2-1.45.1.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f18f76b78f0d2cc4769d5f3b77e5eac6
+_md5_=5ff2602af502da2c72e72e5d24b7cc1f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c1b0e5f7119a..5b3d0bfb538a 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/iputils-20210722-r1 b/metadata/md5-cache/net-misc/iputils-20210722-r1
index b71a36e2f75f..5d13ff3c0318 100644
--- a/metadata/md5-cache/net-misc/iputils-20210722-r1
+++ b/metadata/md5-cache/net-misc/iputils-20210722-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Network monitoring tools including ping and ping6
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6 +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) filecaps? ( sys-libs/libcap )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/20210722.tar.gz -> iputils-20210722.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20210722.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dbe5fe6ec460386b2853102a34135f97
+_md5_=e4b620c6fbc38fe79ffa7208bb001501
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index d4ea03f5e052..7acb6717179a 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2 b/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
index 6a47176bbfdc..8e4fb9a43fda 100644
--- a/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
+++ b/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files
 EAPI=7
 HOMEPAGE=https://www.cups-pdf.de/
 IUSE=+ppds
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=net-print/cups >=app-text/ghostscript-gpl-9.54
 SLOT=0
 SRC_URI=https://www.cups-pdf.de/src/cups-pdf_3.0.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3b0ad513afb2b6d79d959b1ddd9e00d
+_md5_=c903b7f543990ac0ff49f9389670823a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 19d00f018947..5756462821f6 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.09-r3 b/metadata/md5-cache/net-vpn/openconnect-8.09-r3
deleted file mode 100644
index 9e9323b7c756..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-8.09-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
-DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=7
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=174a4f95406d5913774098492bd58bd5
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10 b/metadata/md5-cache/net-vpn/openconnect-8.10
deleted file mode 100644
index 5c8101d0ae76..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-8.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
-DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=7
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200930.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67013cf639f51d7d20ed08715b6f93b5
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10-r5 b/metadata/md5-cache/net-vpn/openconnect-8.10-r5
deleted file mode 100644
index 659611353c58..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-8.10-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
-DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=7
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e65657473f91ff0c33bdf9c02950cf1
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10-r6 b/metadata/md5-cache/net-vpn/openconnect-8.10-r6
new file mode 100644
index 000000000000..2c25d6e10657
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openconnect-8.10-r6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
+DEFINED_PHASES=configure install prepare pretend setup test unpack
+DEPEND=dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
+DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
+EAPI=7
+HOMEPAGE=http://www.infradead.org/openconnect.html
+IUSE=doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test kernel_linux
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4c4919f2270f4a1ccb5e971873161c0f
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index 4e9ed909a2ea..8a45f22be037 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
+DEPEND=dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=7
 HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
+IUSE=doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test kernel_linux
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
+RDEPEND=dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
 RESTRICT=!test? ( test )
 SLOT=0/5
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a86967666a22dd19c000aebf6ea332c4
+_md5_=01481a2cc3f919e2147f406a612c74c1
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.16.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
index 07a3d4037db9..da476f349a2b 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
@@ -5,10 +5,10 @@ DESCRIPTION=Fortinet compatible VPN client
 EAPI=7
 HOMEPAGE=https://github.com/adrienverge/openfortivpn
 IUSE=kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.16.0.tar.gz -> openfortivpn-1.16.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ee576cbe628f0a3a0021a3a4152a7b0f
+_md5_=708b2f8e6600f02704c87c62b486f60b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 63ab1e12ad3a..655a4312c700 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/plocate-1.1.12 b/metadata/md5-cache/sys-apps/plocate-1.1.12
new file mode 100644
index 000000000000..8a7c6df0e026
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.12
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+DESCRIPTION=Posting locate is a much faster locate
+EAPI=7
+HOMEPAGE=https://plocate.sesse.net/
+IUSE=+io-uring kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-2 GPL-2+
+RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
+SLOT=0
+SRC_URI=https://plocate.sesse.net/download/plocate-1.1.12.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2fc49878a79ef7201be4e55d769e3b4
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index d6548d98f515..4685f3ec49a1 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.92.0 b/metadata/md5-cache/sys-auth/fprintd-1.92.0
index 608ffcacf442..cc254e8cf614 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.92.0
+++ b/metadata/md5-cache/sys-auth/fprintd-1.92.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.92.0/fprintd-v1.92.0.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a4611d1569fbdf003318e3fc210141a
+_md5_=b0b5fe03c06fd18a7e147076a4ddb5f4
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.94.0 b/metadata/md5-cache/sys-auth/fprintd-1.94.0
new file mode 100644
index 000000000000..bb5265871c17
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_10(-)] ) ) ( dev-lang/python:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_9(-)] ) ) ( dev-lang/python:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_8(-)] ) ) ) )
+DESCRIPTION=D-Bus service to access fingerprint readers
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
+IUSE=doc pam systemd test
+KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.0/fprintd-v1.94.0.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ae12205db70b0b7a9d89f9a009effb2d
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.1 b/metadata/md5-cache/sys-auth/libfprint-1.94.1
new file mode 100644
index 000000000000..90f057e0f8e0
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0
+DESCRIPTION=Library to add support for consumer fingerprint readers
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
+IUSE=examples gtk-doc +introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0
+SLOT=2
+SRC_URI=https://github.com/freedesktop/libfprint/archive/refs/tags/v1.94.1.tar.gz -> libfprint-1.94.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=cad72dd8c8cb95f42fd92269d6fc3c75
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2-r1
similarity index 95%
rename from metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
rename to metadata/md5-cache/sys-auth/oath-toolkit-2.6.2-r1
index 6067209df514..8b67225f926c 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2-r1
@@ -3,7 +3,7 @@ DEPEND=pam? ( sys-libs/pam ) pskc? ( dev-libs/xmlsec ) test? ( dev-libs/libxml2
 DESCRIPTION=Toolkit for using one-time password authentication with HOTP/TOTP algorithms
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/oath-toolkit/
-IUSE=pam pskc test
+IUSE=pam pskc static-libs test
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=pam? ( sys-libs/pam ) pskc? ( dev-libs/xmlsec )
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=23260ec22257f3dad92f897839904345
+_md5_=b9858d732eb7e4c208dc1336f868384c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d3d6bc9655dd..1846aef12db0 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/lvm2-2.03.13-r2 b/metadata/md5-cache/sys-fs/lvm2-2.03.14
similarity index 94%
rename from metadata/md5-cache/sys-fs/lvm2-2.03.13-r2
rename to metadata/md5-cache/sys-fs/lvm2-2.03.14
index 0ae8f6530368..cdee18d96c54 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.13-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.14
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( !udev ) systemd? ( udev )
 SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.13.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.13.tgz
+SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.14.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.14.tgz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37be258ac42de782aa0328d4742f8994
+_md5_=3b872532b46c3992cbe43ad51717af47
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 646bfcd3e691..8c06bcfeeb82 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75
new file mode 100644
index 000000000000..8d93d7c96460
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.75
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.75
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.75
+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-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.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	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce444a5985b1e8fdbe9bd011db5f9d1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14
new file mode 100644
index 000000000000..b847af4e7689
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.14
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.14
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155
new file mode 100644
index 000000000000..e92a98257a36
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.155
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.155
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.155 || ( 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.155
+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-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.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	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=304627db267cb8d5c02510a10736152b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75
new file mode 100644
index 000000000000..395a89138e2b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.75
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc 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.75
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.75 || ( 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.75
+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-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75-1.xpak -> gentoo-kernel-5.10.75-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75-1.xpak -> gentoo-kernel-5.10.75-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14
new file mode 100644
index 000000000000..9b17bb1a2b87
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc 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.14.14
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.14 || ( 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.14.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14-1.xpak -> gentoo-kernel-5.14.14-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14-1.xpak -> gentoo-kernel-5.14.14-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155
new file mode 100644
index 000000000000..966626005ee5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.155
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc 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.155
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.155 || ( 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.155
+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-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155-1.xpak -> gentoo-kernel-5.4.155-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155-1.xpak -> gentoo-kernel-5.4.155-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.252 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.252
new file mode 100644
index 000000000000..3755ba67f9be
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.252
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.252
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-262.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-262.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-262.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-262.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-262.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-262.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-262.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-262.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-262.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9164ecfb1b215fd3e5c809cf1ab679a3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.213 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.213
new file mode 100644
index 000000000000..b65c0b4a6eeb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.213
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.213
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-212.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-212.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-212.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-212.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-212.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-212.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-212.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-212.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-212.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=67d20c5dcdd4dd95f97ab2b20a7791f0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.75 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.75
new file mode 100644
index 000000000000..10f1708ade45
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.75
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.75
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-81.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-81.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-81.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-81.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-81.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-81.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f8f74e5061facf183f94d027a155164
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.14
new file mode 100644
index 000000000000..acc2c0b69f6a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.14
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-15.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad72bcbe4a40caa856688451960fa08e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.155 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.155
new file mode 100644
index 000000000000..46e9e0162f09
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.155
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.155
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-159.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-159.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-159.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-159.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-159.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-159.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d115b9a4652f0fc8a34335e50faa3fc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75
new file mode 100644
index 000000000000..4bf155f4e11d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.75
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.75
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.75 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.75
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.75.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.75.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	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14
new file mode 100644
index 000000000000..f1d4666b3eea
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.14
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.14
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.14 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.14
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.14.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.14.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155
new file mode 100644
index 000000000000..7e8ec969abdc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.155
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) 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] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.155
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.155 || ( 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.155
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.155.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.155.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	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=dfc72b59d8c98ba8b75b6f1d51fa33a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.252
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.252
index 3ab8df9eafbe..41e7a74943bd 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.252
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.251
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.251.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.252
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.252.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.213
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.213
index a880fe13bf06..dabdf4a4a25a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.213
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.212
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.212.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.213
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.213.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.75
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.75
index 0a861884eb92..bc9baa701be1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.75
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.74
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.74.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.75
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.75.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.14
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.14.14
index b73948b92006..6c115cf98b66 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.14
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.14.13
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+SLOT=5.14.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.155
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.155
index add0c8aefc6c..7297eeea7cde 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.155
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.154
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.154.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.155
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.155.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 214dbcdc0112..bb350077502d 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/acpi-1.7-r1 b/metadata/md5-cache/sys-power/acpi-1.7-r1
index 20262b8735eb..8516fb9e3481 100644
--- a/metadata/md5-cache/sys-power/acpi-1.7-r1
+++ b/metadata/md5-cache/sys-power/acpi-1.7-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Displays information about ACPI devices
-EAPI=6
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/acpiclient/
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/acpiclient/acpi-1.7.tar.gz
-_md5_=60b19e8cc34416b52fdc75acbf5729e6
+_md5_=9c179cac4ede0dc52643d6b483b3f3aa
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 9d73927c0750..ad26334e6d3e 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r6 b/metadata/md5-cache/sys-process/fcron-3.2.1-r8
similarity index 92%
rename from metadata/md5-cache/sys-process/fcron-3.2.1-r6
rename to metadata/md5-cache/sys-process/fcron-3.2.1-r8
index 7949bf565c73..3c3977cc19ca 100644
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r6
+++ b/metadata/md5-cache/sys-process/fcron-3.2.1-r8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=49ee28a3968acddb2161a024518bc225
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8b3bfbe4bd58870c9dad602166713aab
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r3 b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r5
similarity index 92%
rename from metadata/md5-cache/sys-process/fcron-3.3.0_beta-r3
rename to metadata/md5-cache/sys-process/fcron-3.3.0_beta-r5
index 0ea5a1764bcf..4a5e5fbf5db1 100644
--- a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r3
+++ b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.3.0.src.tar.gz -> fcron-3.3.0_beta.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c63870764d7b220210899bcbcfbd08d
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=11313c726ac0c5288ba22158637c626f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ad6c59001e51..828074122d22 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.75 b/metadata/md5-cache/virtual/dist-kernel-5.10.75
new file mode 100644
index 000000000000..38cc33c55368
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.75
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.75 ~sys-kernel/gentoo-kernel-bin-5.10.75 ~sys-kernel/vanilla-kernel-5.10.75 )
+SLOT=0/5.10.75
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.14 b/metadata/md5-cache/virtual/dist-kernel-5.14.14
new file mode 100644
index 000000000000..e869bf6c15f7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.14
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.14 ~sys-kernel/gentoo-kernel-bin-5.14.14 ~sys-kernel/vanilla-kernel-5.14.14 )
+SLOT=0/5.14.14
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.155 b/metadata/md5-cache/virtual/dist-kernel-5.4.155
new file mode 100644
index 000000000000..accf0f904567
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.155
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.155 ~sys-kernel/gentoo-kernel-bin-5.4.155 ~sys-kernel/vanilla-kernel-5.4.155 )
+SLOT=0/5.4.155
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ce93759d7bcb..f7cee394bdaf 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2457.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2457.3
new file mode 100644
index 000000000000..ec936aadbde4
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.4.2457.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A browser for our friends
+EAPI=8
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2457.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2457.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.4.2457.3-1_arm64.deb )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5055ba9336d4f5cb457c4118545ba02
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 16ce90c3d666..a9c229d5c410 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/qt5ct-1.3 b/metadata/md5-cache/x11-misc/qt5ct-1.3
index 28e854617765..e4d6adbc9d76 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.3
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.3
@@ -1,14 +1,13 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
 DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
-IUSE=+dbus
 KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=BSD-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.3.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8875fe747ef1f8486a7c117033cd74e
+_md5_=d635e93ea82b756702fbf7073795fbb3
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.5 b/metadata/md5-cache/x11-misc/qt5ct-1.5
index 19c49e35217c..4792fe1129d0 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.5
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.5
@@ -1,14 +1,13 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
 DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
-IUSE=+dbus
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=BSD-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.5.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05a846370ab82006372f61620ffdcdca
+_md5_=dd401ed11192491be31ae470c70ef97a
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 3c14ae292c4a..22e72e7af01c 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/i3-4.20 b/metadata/md5-cache/x11-wm/i3-4.20
new file mode 100644
index 000000000000..96031abd9b01
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/i3-4.20
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
+DESCRIPTION=An improved dynamic tiling window manager
+EAPI=8
+HOMEPAGE=https://i3wm.org/
+IUSE=doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://i3wm.org/downloads/i3-4.20.tar.xz
+_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=353ce361e122b1cc41ca0e641455c456
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 25ea960b4f8e..ddaf764ec710 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Oct 2021 05:39:13 +0000
+Wed, 20 Oct 2021 20:08:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c39e377abd92..e7d268d99690 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct 20 05:39:12 AM UTC 2021
+Wed Oct 20 08:08:55 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e00dacf538e9..d474fef674ff 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Oct 2021 06:00:01 +0000
+Wed, 20 Oct 2021 20:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e9dbcb46d4f2..f1ca78cbcefb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d504c7f3b7fe1f51d1e84a4e59153b5c82eae727 1634704832 2021-10-20T04:40:32+00:00
+44641cc66e57405252f89266a96cf7a86c9eafd4 1634757661 2021-10-20T19:21:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9b8b7db6d019..f8ac17ec028f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1634708101 Wed 20 Oct 2021 05:35:01 AM UTC
+1634760302 Wed 20 Oct 2021 08:05:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 26c4ec1514aa..ddaf764ec710 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 20 Oct 2021 05:39:12 +0000
+Wed, 20 Oct 2021 20:08:55 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3769ea973dbf..35896341a101 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f159984d9176..0743badb86df 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c SHA512 3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
-DIST icinga2-2.13.0.tar.gz 7584525 BLAKE2B 94c08030e508c35d610c12e9855015da35e4dd6a67614bc44ab5605ba61f9f3f9ddc4fec98be8534ae2e84d1d1c1065295b872c6a060a36e821f929c04a90172 SHA512 a3eb0166bb2851a7e6e795fc541b535db3ac2d8d9c2e4e72caf0472e54ac0ef110ea97a1c1c208b97c2b99e1ec51919a378bba68b21e770786074dcb1af4bd26
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003 SHA512 450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
diff --git a/net-analyzer/icinga2/icinga2-2.13.0.ebuild b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
deleted file mode 100644
index de80eb55dfc4..000000000000
--- a/net-analyzer/icinga2/icinga2-2.13.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66.0:=[context]
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl:=
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd"
-BDEPEND="
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-		-DUSE_SYSTEMD=$(usex systemd)
-		-DLOGROTATE_HAS_SU=ON
-		-DICINGA2_LTO_BUILD=$(usex lto)
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres)
-			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql || use mariadb; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/run" || die "failed to remove /run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5f98bed230fe..d615d559d657 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/inspircd/inspircd-3.11.0.ebuild b/net-irc/inspircd/inspircd-3.11.0.ebuild
index d013d22d99d8..b8aa1c3f23b4 100644
--- a/net-irc/inspircd/inspircd-3.11.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 967e003c05ae..f982ec10072e 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
index 0001e7e95a79..142836527b15 100644
--- a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 77593519123c..e442ba75f30b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
index 7d70dc9970a2..f572846d61e0 100644
--- a/net-misc/iputils/iputils-20210722-r1.ebuild
+++ b/net-misc/iputils/iputils-20210722-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 46ae22f6df8e..42f09e8b1a86 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
index eb1bfa417558..d95f554289f9 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PV/_}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="+ppds"
 
 DEPEND="net-print/cups"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0ae684c6f121..5a124356e4e3 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 59221ffa774e..3938384a6964 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,4 +1 @@
-DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd
 DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356
-DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
-DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d
diff --git a/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch b/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch
deleted file mode 100644
index bf8990ae3d3c..000000000000
--- a/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From eef4c1f9d24478aa1d2dd9ac7ec32efb2137f474 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 8 May 2020 10:39:41 -0400
-Subject: [PATCH] gnutls: prevent buffer overflow in get_cert_name
-
-The test suite for ocserv calls openconnect with a certificate that has
-a name that is 84 bytes in length. The buffer passed to get_cert_name is
-currently 80 bytes.
-
-The gnutls_x509_crt_get_dn_by_oid function will update the buffer size
-parameter if the buffer is too small.
-
-http://man7.org/linux/man-pages/man3/gnutls_x509_crt_get_dn_by_oid.3.html
-
-RETURNS
-       GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long
-       enough, and in that case the  buf_size will be updated with the
-       required size. GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE if there are no
-       data in the current index. On success 0 is returned.
-
-Use a temporary variable to avoid clobbering the namelen variable that is
-passed to get_cert_name.
-
-Bug: https://bugs.gentoo.org/721570
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- gnutls.c | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/gnutls.c b/gnutls.c
-index 36bc82e0..53bf2a43 100644
---- a/gnutls.c
-+++ b/gnutls.c
-@@ -546,12 +546,19 @@ static int count_x509_certificates(gnutls_datum_t *datum)
- 
- static int get_cert_name(gnutls_x509_crt_t cert, char *name, size_t namelen)
- {
-+	/* When the name buffer is not big enough, gnutls_x509_crt_get_dn*() will
-+	 * update the length argument to the required size, and return
-+	 * GNUTLS_E_SHORT_MEMORY_BUFFER. We need to avoid clobbering the original
-+	 * length variable. */
-+	size_t nl = namelen;
- 	if (gnutls_x509_crt_get_dn_by_oid(cert, GNUTLS_OID_X520_COMMON_NAME,
--					  0, 0, name, &namelen) &&
--	    gnutls_x509_crt_get_dn(cert, name, &namelen)) {
--		name[namelen-1] = 0;
--		snprintf(name, namelen-1, "<unknown>");
--		return -EINVAL;
-+					  0, 0, name, &nl)) {
-+		nl = namelen;
-+		if (gnutls_x509_crt_get_dn(cert, name, &nl)) {
-+			name[namelen-1] = 0;
-+			snprintf(name, namelen-1, "<unknown>");
-+			return -EINVAL;
-+		}
- 	}
- 	return 0;
- }
--- 
-2.26.2
-
diff --git a/net-vpn/openconnect/files/README.OpenRC.txt b/net-vpn/openconnect/files/README.OpenRC.txt
deleted file mode 100644
index 6bd43e62dfbc..000000000000
--- a/net-vpn/openconnect/files/README.OpenRC.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
diff --git a/net-vpn/openconnect/files/openconnect.conf.in b/net-vpn/openconnect/files/openconnect.conf.in
deleted file mode 100644
index 7e44f569c0c4..000000000000
--- a/net-vpn/openconnect/files/openconnect.conf.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# Variables to configure vpn tunnels where "vpnname" is the name of your vpn tunnel:
-#
-# server_vpnname
-# password_vpnname
-# vpnopts_vpnname
-#
-# The tunnel will need to be started with a symbolic link to openconnect:
-#
-# ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpnname
-#
-# If you'd like to execute a script on preup, postup, predown and postdown of the vpn tunnel, you
-# need to create executable scripts in a directory with the same name as
-# the vpn tunnel (vpn0 can be replaced with the vpn name):
-#
-# mkdir /etc/openconnect/vpn0
-# cd /etc/openconnect/vpn0"
-# echo '#!/bin/sh' > preup.sh"
-# cp preup.sh predown.sh"
-# cp preup.sh postup.sh"
-# cp preup.sh postdown.sh"
-# chmod 755 /etc/openconnect/vpn0/*"
-
-server_vpn0="vpn.server.tld"
-password_vpn0="YOUR_PASSWORD"
-# Any OPENCONNECT options my go here (see openconnect --help)
-vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME"
diff --git a/net-vpn/openconnect/files/openconnect.init.in-r4 b/net-vpn/openconnect/files/openconnect.init.in-r4
deleted file mode 100644
index 040edc76f637..000000000000
--- a/net-vpn/openconnect/files/openconnect.init.in-r4
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPN="${RC_SVCNAME#*.}"
-VPNDIR="/etc/openconnect/${VPN}"
-VPNLOG="/var/log/openconnect/${VPN}"
-VPNLOGFILE="${VPNLOG}/openconnect.log"
-VPNERRFILE="${VPNLOG}/openconnect.err"
-
-command="/usr/sbin/openconnect"
-name="OpenConnect: ${VPN}"
-pidfile="/run/openconnect/${VPN}.pid"
-stopsig="SIGINT"
-
-depend() {
-	before netmount
-}
-
-checkconfig() {
-	if [ $VPN = "openconnect" ]; then
-		eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:"
-		eerror
-		eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
-		eerror
-		eerror "And then call it instead:"
-		eerror
-		eerror "/etc/init.d/openconnect.vpn0 start"
-		return 1
-	fi
-}
-
-checktuntap() {
-	if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then
-		if ! modprobe tun ; then
-			eerror "TUN/TAP support is not available in this kernel"
-			return 1
-		fi
-	fi
-}
-
-run_hook() {
-	if [ -x "$1" ]; then
-		"$@"
-	fi
-}
-
-start_pre() {
-	checkconfig || return
-	checktuntap || return
-	checkpath -d "${VPNLOG}" || return
-	checkpath -d /run/openconnect || return
-	run_hook "${VPNDIR}/preup.sh"
-}
-
-start() {
-	local server vpnopts password
-	eval server=\$server_${VPN}
-	eval vpnopts=\$vpnopts_${VPN}
-	eval password=\$password_${VPN}
-
-	ebegin "Starting ${name}"
-	start-stop-daemon --start --exec "${command}" -- \
-		--background \
-		--interface="${VPN}" \
-		--pid-file="${pidfile}" \
-		${vpnopts} \
-		"${server}" \
-		>> "${VPNLOGFILE}" \
-		2>> "${VPNERRFILE}" \
-		<<EOF
-${password}
-EOF
-	eend $?
-}
-
-start_post() {
-	run_hook "${VPNDIR}/postup.sh"
-}
-
-stop_pre() {
-	checkconfig || return
-	run_hook "${VPNDIR}/predown.sh"
-}
-
-stop_post() {
-	run_hook "${VPNDIR}/postdown.sh"
-}
diff --git a/net-vpn/openconnect/metadata.xml b/net-vpn/openconnect/metadata.xml
index 41262f103fd0..0660a620fe5b 100644
--- a/net-vpn/openconnect/metadata.xml
+++ b/net-vpn/openconnect/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="gssapi">Build GSSAPI support</flag>
 		<flag name="libproxy">Enable proxy support</flag>
+		<flag name="pskc">Enable PSKC file storage of HOTP/TOTP keys</flag>
 		<flag name="stoken">Enable stoken support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild
deleted file mode 100644
index c5c21a23d94d..000000000000
--- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-PYTHON_REQ_USE="xml"
-
-inherit linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-VPNC_VER=20200226
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0=
-	)
-	gnutls? (
-		app-crypt/trousers
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3.6.13:0=
-		dev-libs/libtasn1:0=
-		app-crypt/tpm2-tss
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )
-"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	nls? ( sys-devel/gettext )
-	test? (
-		net-libs/socket_wrapper
-		net-vpn/ocserv
-		sys-libs/uid_wrapper
-	)
-"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/8.09-gnutls-buffer-overflow.patch
-	)
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use doc; then
-		python_setup
-	else
-		export ac_cv_path_PYTHON=
-	fi
-
-	# Used by tests if userpriv is disabled
-	addwrite /run/netns
-
-	local myconf=(
-		--disable-dsa-tests
-		$(use_enable nls)
-		--disable-static
-		$(use_with !gnutls openssl)
-		$(use_with gnutls)
-		$(use_with libproxy)
-		$(use_with lz4)
-		$(use_with gssapi)
-		$(use_with smartcard libpcsclite)
-		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
-		--without-java
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local charset
-	for charset in UTF-8 ISO8859-2; do
-		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
-			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
-			# Force a test skip by exiting with status 77.
-			sed -i -e '2i exit 77' tests/auth-nonascii || die
-			break
-		fi
-	done
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc "${FILESDIR}"/README.OpenRC.txt
-
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	insinto /etc/openconnect
-
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-
-	keepdir /var/log/openconnect
-}
diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r6.ebuild
similarity index 94%
rename from net-vpn/openconnect/openconnect-8.10-r5.ebuild
rename to net-vpn/openconnect/openconnect-8.10-r6.ebuild
index d8210a2b00ad..da0988a8a8fc 100644
--- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10-r6.ebuild
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2
 	sys-libs/zlib
+	app-crypt/p11-kit
 	!gnutls? (
 		>=dev-libs/openssl-1.0.1h:0=
+		dev-libs/libp11
 	)
 	gnutls? (
 		app-crypt/trousers
@@ -42,6 +44,7 @@ DEPEND="
 	libproxy? ( net-libs/libproxy )
 	lz4? ( app-arch/lz4:= )
 	nls? ( virtual/libintl )
+	pskc? ( sys-auth/oath-toolkit[pskc] )
 	smartcard? ( sys-apps/pcsc-lite:0= )
 	stoken? ( app-crypt/stoken )
 "
@@ -103,6 +106,7 @@ src_configure() {
 		$(use_with libproxy)
 		$(use_with lz4)
 		$(use_with gssapi)
+		$(use_with pskc libpskc)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
 		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
diff --git a/net-vpn/openconnect/openconnect-8.10.ebuild b/net-vpn/openconnect/openconnect-8.10.ebuild
deleted file mode 100644
index ff4f18582c19..000000000000
--- a/net-vpn/openconnect/openconnect-8.10.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-PYTHON_REQ_USE="xml"
-
-inherit linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
-	inherit git-r3 autotools
-else
-	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-VPNC_VER=20200930
-SRC_URI="${ARCHIVE_URI}
-	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0=
-	)
-	gnutls? (
-		app-crypt/trousers
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3.6.13:0=
-		dev-libs/libtasn1:0=
-		app-crypt/tpm2-tss
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )
-"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	nls? ( sys-devel/gettext )
-	test? (
-		net-libs/socket_wrapper
-		net-vpn/ocserv
-		sys-libs/uid_wrapper
-	)
-"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use doc; then
-		python_setup
-	else
-		export ac_cv_path_PYTHON=
-	fi
-
-	# Used by tests if userpriv is disabled
-	addwrite /run/netns
-
-	local myconf=(
-		--disable-dsa-tests
-		$(use_enable nls)
-		--disable-static
-		$(use_with !gnutls openssl)
-		$(use_with gnutls)
-		$(use_with libproxy)
-		$(use_with lz4)
-		$(use_with gssapi)
-		$(use_with smartcard libpcsclite)
-		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
-		--without-java
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local charset
-	for charset in UTF-8 ISO8859-2; do
-		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
-			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
-			# Force a test skip by exiting with status 77.
-			sed -i -e '2i exit 77' tests/auth-nonascii || die
-			break
-		fi
-	done
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc "${FILESDIR}"/README.OpenRC.txt
-
-	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
-	insinto /etc/openconnect
-
-	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
-
-	exeinto /etc/openconnect
-	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-
-	keepdir /var/log/openconnect
-}
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index b2332da693ea..5a6a3065e1dc 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2
 	sys-libs/zlib
+	app-crypt/p11-kit
 	!gnutls? (
 		>=dev-libs/openssl-1.0.1h:0=
+		dev-libs/libp11
 	)
 	gnutls? (
 		app-crypt/trousers
@@ -42,6 +44,7 @@ DEPEND="
 	libproxy? ( net-libs/libproxy )
 	lz4? ( app-arch/lz4:= )
 	nls? ( virtual/libintl )
+	pskc? ( sys-auth/oath-toolkit[pskc] )
 	smartcard? ( sys-apps/pcsc-lite:0= )
 	stoken? ( app-crypt/stoken )
 "
@@ -103,6 +106,7 @@ src_configure() {
 		$(use_with libproxy)
 		$(use_with lz4)
 		$(use_with gssapi)
+		$(use_with pskc libpskc)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
 		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
diff --git a/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
index 0c64cdfd137f..db3015c68b85 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	net-dialup/ppp
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 49be2484053d..97ef4f9ca8b4 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 12a4a5d4824c..2d125c8486e6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -691,7 +691,6 @@ app-emulation/xe-guest-utilities:xenstore - Use xenstore binaries bundled by Cit
 app-emulation/xen:efi - Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64
 app-emulation/xen:flask - Enable the Flask XSM module from NSA
 app-emulation/xen-tools:api - Build the C libxenapi bindings
-app-emulation/xen-tools:flask - Enable the Flask XSM module from NSA
 app-emulation/xen-tools:hvm - Enable support for hardware based virtualization (VT-x,AMD-v)
 app-emulation/xen-tools:ipxe - Enable ipxe support
 app-emulation/xen-tools:ovmf - Enable support to boot UEFI guest vm, needed by hvm
@@ -6855,6 +6854,7 @@ net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
 net-vpn/ocserv:otp - Enable support for one-time passwords
 net-vpn/openconnect:gssapi - Build GSSAPI support
 net-vpn/openconnect:libproxy - Enable proxy support
+net-vpn/openconnect:pskc - Enable PSKC file storage of HOTP/TOTP keys
 net-vpn/openconnect:stoken - Enable stoken support
 net-vpn/openvpn:down-root - Enable the down-root plugin
 net-vpn/openvpn:iproute2 - Enabled iproute2 support instead of net-tools
@@ -8784,7 +8784,6 @@ x11-misc/primus:libglvnd - Use media-libs/libglvnd for dispatch
 x11-misc/py3status:gevent - Install extra requirement dev-python/gevent to enable green threads.
 x11-misc/py3status:minimal - Don't depend on x11-misc/i3status if you don't plan to use any of its built-in modules.
 x11-misc/py3status:udev - Install extra requirement dev-python/pyudev to enable udev events monitoring on modules.
-x11-misc/qt5ct:dbus - Enable system tray and global menu support
 x11-misc/qtfm:dbus - Install the qtfm-tray removable device manager
 x11-misc/qtfm:shared - Install the libQtFM shared library and headers
 x11-misc/read-edid:vbe-mode - Build get-edid with support for legacy, VBE-based interface. Requires dev-libs/libx86.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e9bcac82b2b5..a4265384ee27 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 14479462c62a..dce503b54a9a 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,3 +1,4 @@
 DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433
+DIST plocate-1.1.12.tar.gz 72710 BLAKE2B 4b12d49f1e2827a5bfbc2d110579bb6af3c74368bb8d1ad76cc979a75d58e234dbc011bffcf2ee92059a2e1d62cacd06ba43fac2abcc130176aa2d034ad94211 SHA512 b22d6c45f43ac06391f7a92e9ef8d642d1da2ee40d7273e4a61d278d05cdc2be6d5a777ed5966bdf58b13ac7027518e3eb308d7034db030c665cf3b35baea2b5
 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
diff --git a/sys-apps/plocate/plocate-1.1.12.ebuild b/sys-apps/plocate/plocate-1.1.12.ebuild
new file mode 100644
index 000000000000..b7c6c2e00ec2
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.12.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~IO_URING"
+ERROR_IO_URING="required for USE=io-uring"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
+)
+
+src_prepare() {
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+		-Dinstall_systemd=true
+		-Dinstall_cron=false
+		-Dsystemunitdir="$(systemd_get_systemunitdir)"
+		"$(meson_feature io-uring use_libiouring)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	# Ensure that the cron file has the same name as the
+	# systemd-timer, to avoid plocate being run twice daily on systems
+	# with a systemd compatiblity layer. See also bug #780351.
+	newins "${FILESDIR}"/plocate.cron plocate-updatedb
+	fperms 0755 /etc/cron.daily/plocate-updatedb
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6add7fb5a222..eb94227bcbbc 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 3a2c440d47f5..9360412d9a69 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -2,3 +2,4 @@ DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4
 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
 DIST fprintd-v1.92.0.tar.bz2 651377 BLAKE2B 39db660e3203b08c1233b9711f56c5b4539f1dff4f8cd9554dce4ce055e2fd2a63dc5e8792808232f86906bf1b7d15a7f155e67ddd49a98ff92ac75b4bd712f4 SHA512 e3fcf948321bf82398f06cca33cb29745c7fc38421025c9340dc85ba2ffb87e63f9546aae721ae72ad0c6f4268a856d60cd57089238d5c92e14b31de215f17d1
+DIST fprintd-v1.94.0.tar.bz2 656308 BLAKE2B f64f92af51f2d3eda059640cdfa88b26ca12326b3082e9489f6d807ec566aced86e1d19a59ad247ec2aaa6e6a90dd3d030c18e062e39143a1d4110e62e7ad03d SHA512 1ab8cf93d10317201c3f83880b9e6de4a391c2a12afe29725ae3556a7b0108a374eb96f6b2b5be69c01c386f62e3543e3f9a974867256c99e690dd19bdd5778d
diff --git a/sys-auth/fprintd/fprintd-1.92.0.ebuild b/sys-auth/fprintd/fprintd-1.92.0.ebuild
index db5a0d6162f2..cdabc2ee675b 100644
--- a/sys-auth/fprintd/fprintd-1.92.0.ebuild
+++ b/sys-auth/fprintd/fprintd-1.92.0.ebuild
@@ -62,7 +62,8 @@ python_check_deps() {
 	if use test; then
 		has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]"
 	fi
-	has_version -d "dev-python/dbusmock[${PYTHON_USEDEP}]" &&
+
+	has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
 	has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
 	has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]"
 }
diff --git a/sys-auth/fprintd/fprintd-1.94.0.ebuild b/sys-auth/fprintd/fprintd-1.94.0.ebuild
new file mode 100644
index 000000000000..d3f73d28d4f4
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.94.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson pam python-any-r1 systemd
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="D-Bus service to access fingerprint readers"
+HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+IUSE="doc pam systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=sys-auth/libfprint-1.94.0:2
+	sys-auth/polkit
+	pam? (
+		sys-libs/pam
+		systemd? ( sys-apps/systemd )
+		!systemd? ( sys-auth/elogind )
+	)"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] )
+		')
+	)"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gtk-doc
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch"
+	"${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]"
+	fi
+
+	has_version -d "dev-python/python-dbusmock[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+		local emesonargs=(
+			$(meson_feature test)
+			$(meson_use pam)
+			-Dgtk_doc=$(usex doc true false)
+			-Dman=true
+			-Dsystemd_system_unit_dir=$(systemd_get_systemunitdir)
+			-Dpam_modules_dir=$(getpam_mod_dir)
+			-Dlibsystemd=$(usex systemd libsystemd libelogind)
+		)
+		meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dodoc AUTHORS NEWS README TODO
+	newdoc pam/README README.pam_fprintd
+}
+
+pkg_postinst() {
+	elog "Please take a look at README.pam_fprintd for integration docs."
+}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index cd36771ff267..94b52c4e2acd 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,3 +1,4 @@
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.90.7.tar.gz 6375722 BLAKE2B d0cb085c3846e870ff31dc346b8e138ab994f03e428aa1887066e56243d10179f3674538841edc75e02c8b58fc9a2ea1e97999fa919bad033aa52c88742948fd SHA512 2781ebb337cbd37affe203a7d054651abc7de4f2f450cddfb78a29e4f93e6a698dd950cc9be7112f43c5a892309e75b11e46cdcb60359859aae3811468adc8af
 DIST libfprint-1.92.0.tar.gz 8434928 BLAKE2B eba5d103a7ffc1d297bc276baac1f55dcc308bc18a4507fa53552044eb1a57bdb04cab0d81ee1b4022b5407f3cea06f72a686eac1b1cc5b178258b33e81b9216 SHA512 5f802aa65525bbe1c057053f9752052fe8f4e614ec22d373339cba42396a4e7ffe9cbdf7a7b732729e9aac7a4cde42fb5156949e83c574a30c0ad7b23ae4bc38
+DIST libfprint-1.94.1.tar.gz 10405046 BLAKE2B a46af62d3f7f8ad7f0815cecbd2a8c68c212e13785b968b0f0304473db5f4b7eb67d0bb74411c4828a51b9c22f6c86bd08ad564db623acf31715a1d0f7aa8389 SHA512 bae1de8378b9fb8fed1e292d96637a1e4a1c99a5a3f7735dae036eddb022bea2b5646bebf610b714338d4645e73b0968b14c20b1992d77d83a60c939c1509b44
diff --git a/sys-auth/libfprint/libfprint-1.94.1.ebuild b/sys-auth/libfprint/libfprint-1.94.1.ebuild
new file mode 100644
index 000000000000..d39bdf593365
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.94.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="Library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples gtk-doc +introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgusb
+	dev-libs/nss
+	virtual/libusb:1=
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/pixman
+	!>=sys-auth/libfprint-1.90:0
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples gtk-examples)
+		$(meson_use gtk-doc doc)
+		$(meson_use introspection)
+		-Ddrivers=all
+		-Dudev_rules=enabled
+		-Dudev_rules_dir=$(get_udevdir)/rules.d
+		--libdir=/usr/$(get_libdir)
+	)
+	meson_src_configure
+}
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2-r1.ebuild
similarity index 92%
rename from sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
rename to sys-auth/oath-toolkit/oath-toolkit-2.6.2-r1.ebuild
index 6e5a98f59d54..e6e4f650cf44 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3 LGPL-2.1"
 
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="pam pskc test"
+IUSE="pam pskc static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -53,11 +53,13 @@ src_configure() {
 		$(use_enable test xmltest ) \
 		$(use_enable pam) \
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable pskc)
+		$(use_enable pskc) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
+	find "${ED}" -name '*.la' -type f -delete || die
 	if use pam; then
 		newdoc pam_oath/README README.pam
 	fi
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5e0b850f7677..15bb94a4f45e 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 184ba81578fa..f62db729f464 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,2 +1,2 @@
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
-DIST LVM2.2.03.13.tgz 2619537 BLAKE2B 8f93896105e4d392ab88f027bbc0ea874b179a73d10ff8d0850ead2625e86468fe69d55c6fb0108f57a1efc1d3e8cc94647f1bc06636e4a714d0817224bbbfd7 SHA512 8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a
+DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch
similarity index 82%
rename from sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch
rename to sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch
index 083a7327c6a6..e259547a47b0 100644
--- a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch
+++ b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch
@@ -1,4 +1,4 @@
-From 88aeb306dfd1e0174bf02cc208d46f0d722204dc Mon Sep 17 00:00:00 2001
+From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001
 From: "Robin H. Johnson" <robbat2@gentoo.org>
 Date: Sun, 9 May 2021 11:00:22 +0200
 Subject: [PATCH] Use pkgconfig to detect static libs
@@ -9,10 +9,10 @@ Subject: [PATCH] Use pkgconfig to detect static libs
  2 files changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 354b53b5ec..e872d70256 100644
+index 6cdf1a7e65..90452ebf7c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1097,6 +1097,7 @@ if test "$BLKID_WIPING" != no; then
+@@ -1168,6 +1168,7 @@ if test "$BLKID_WIPING" != no; then
  	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
  			  [ BLKID_WIPING=yes
  			    BLKID_PC="blkid"
@@ -20,7 +20,7 @@ index 354b53b5ec..e872d70256 100644
  			    DEFAULT_USE_BLKID_WIPING=1
  			    AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
  			  ], [if test "$BLKID_WIPING" = maybe; then
-@@ -1145,6 +1146,7 @@ AC_MSG_RESULT($UDEV_SYNC)
+@@ -1213,6 +1214,7 @@ AC_MSG_RESULT($UDEV_SYNC)
  if test "$UDEV_SYNC" = yes; then
  	pkg_config_init
  	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
@@ -28,7 +28,7 @@ index 354b53b5ec..e872d70256 100644
  	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
  
  	AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1,
-@@ -1369,19 +1371,30 @@ dnl -- Check for selinux
+@@ -1432,19 +1434,30 @@ dnl -- Check for selinux
  if test "$SELINUX" = yes; then
  	AC_CHECK_LIB([sepol], [sepol_check_context], [
  		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
@@ -61,7 +61,7 @@ index 354b53b5ec..e872d70256 100644
  fi
  
  ################################################################################
-@@ -1755,6 +1768,7 @@ AC_DEFINE_UNQUOTED(LVM_CONFIGURE_LINE, "$CONFIGURE_LINE", [configure command lin
+@@ -1834,6 +1847,7 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev])
  ################################################################################
  AC_SUBST(AWK)
  AC_SUBST(BLKID_PC)
@@ -69,15 +69,15 @@ index 354b53b5ec..e872d70256 100644
  AC_SUBST(BUILD_CMIRRORD)
  AC_SUBST(BUILD_DMEVENTD)
  AC_SUBST(BUILD_LVMDBUSD)
-@@ -1857,6 +1871,7 @@ AC_SUBST(SALCK_LIBS)
+@@ -1934,6 +1948,7 @@ AC_SUBST(SALCK_LIBS)
  AC_SUBST(SBINDIR)
  AC_SUBST(SELINUX_LIBS)
  AC_SUBST(SELINUX_PC)
 +AC_SUBST(SELINUX_STATIC_LIBS)
  AC_SUBST(SYSCONFDIR)
- AC_SUBST(SYSTEMD_LIBS)
  AC_SUBST(SNAPSHOTS)
-@@ -1875,6 +1890,7 @@ AC_SUBST(CACHE_REPAIR_CMD)
+ AC_SUBST(STATICDIR)
+@@ -1950,6 +1965,7 @@ AC_SUBST(CACHE_REPAIR_CMD)
  AC_SUBST(CACHE_RESTORE_CMD)
  AC_SUBST(UDEV_PC)
  AC_SUBST(UDEV_RULES)
@@ -86,7 +86,7 @@ index 354b53b5ec..e872d70256 100644
  AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS)
  AC_SUBST(UDEV_RULE_EXEC_DETECTION)
 diff --git a/make.tmpl.in b/make.tmpl.in
-index 99f02e8b77..ae189546d0 100644
+index cccda10d6f..bf6c3e5596 100644
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
 @@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
@@ -98,20 +98,27 @@ index 99f02e8b77..ae189546d0 100644
  DEFS += @DEFS@
  # FIXME set this only where it's needed, not globally?
  CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
-@@ -83,10 +83,13 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+@@ -82,6 +82,7 @@ AIO_CFLAGS = @AIO_CFLAGS@
+ AIO_LIBS = @AIO_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
+ CPG_CFLAGS = @CPG_CFLAGS@
+ CPG_LIBS = @CPG_LIBS@
+ EDITLINE_CFLAGS = @EDITLINE_CFLAGS@
+@@ -90,10 +91,12 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_CFLAGS = @READLINE_CFLAGS@
  READLINE_LIBS = @READLINE_LIBS@
- EDITLINE_LIBS = @EDITLINE_LIBS@
  SELINUX_LIBS = @SELINUX_LIBS@
 +SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
  UDEV_CFLAGS = @UDEV_CFLAGS@
  UDEV_LIBS = @UDEV_LIBS@
 +UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- SYSTEMD_LIBS = @SYSTEMD_LIBS@
  VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
- USE_TRACKING = @USE_TRACKING@
+ VALGRIND_LIBS = @VALGRIND_LIBS@
+ 
 -- 
-2.31.1
+2.33.1
 
diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.14.ebuild
similarity index 99%
rename from sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.03.14.ebuild
index f23621e8619b..1cc2795b71b0 100644
--- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14.ebuild
@@ -63,7 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
 	"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 55f0460d9732..8b2df4d5bebf 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 21ea75d63e84..14666c0b986c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 2da2a130876482ac0c4c2959e4fa
 DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504 SHA512 538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
 DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
 DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
+DIST genpatches-5.10-81.base.tar.xz 2412768 BLAKE2B fe3b30c2ebbf250eb62c5add14310326a72f01705c010b202768f37a29e6acff39bec319d0629450c0efd3dc69e414a0b6e541d95283f619e5efb425655d8329 SHA512 544e4af48bc55de74ea145a3d01392ce8742faa88580946c16530575512d8f0b7a6e152755c7bd96548080dfc5758a5a33d6b826e97f75a783e50f361f1852d5
+DIST genpatches-5.10-81.extras.tar.xz 3844 BLAKE2B 9774afc1d893bfa0439cebb0d006cf1c0682571668e09adbf97df38c159f016176b8db538562e896a3ef0380e7ab830503d952d8448b2bd02adb22e84cfa0bea SHA512 c450131db06e63521ec0455a76bd4005f62527e92c0971b63e7076f4fdbae41aa6f4648dd5888bcebaffd41c3c5aff99d99efc0531988fdb54cc9bd3af1bcf96
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
@@ -24,6 +26,8 @@ DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6
 DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
 DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
 DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
+DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
+DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
@@ -42,6 +46,8 @@ DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff63
 DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
 DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
 DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
+DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
+DIST genpatches-5.4-159.extras.tar.xz 1788 BLAKE2B b3bdde65db00da9eaa5e9d3e1a813bca63304608d61af3c4712a5588fe946a9c53974066467af1678cb7e44646dec35ea607133911f1da2e8a4320118cb44431 SHA512 72353c4e7a35c2513bc9d27888050de1446ece8cb9c079ac03ff90cd855070c31001e37f741c42a2b3d2a76890913cae9cd12b19f2250549273b47667b55435f
 DIST gentoo-kernel-5.10.68-1.amd64.xpak 65497706 BLAKE2B 526ea1fc91fc906828366b4f7c10cb04a0e1cffe19702443790d52ba82a99710aa9ce1eeb7832a0da9970f9ec073173c846d5872ade5ae6f44fb33c20b0c46b8 SHA512 6be46f7608dbe3ad05472264957b23e8a841ecab3a978ec94de8043f864a9e9864e8086f979bf185010e65bbec23af941eb3a82828c3341da9a365410c85a030
 DIST gentoo-kernel-5.10.68-1.arm64.xpak 61234698 BLAKE2B f30cf0cd18711f3b42d9bfcb528ca56c7bafb88477414a3ed6ecd9c26b66fe76c1c1370461c3b1b83a13266240a20f55cbc35fd68d66bb8ca20503cc26f91f15 SHA512 df478abac49f43635cbe7b79faa188570cee3419d920877f05346fae7a3a16333f95c778d170b509277a0ee08c08d73589a177b69f86fdcdf800bde8481b903c
 DIST gentoo-kernel-5.10.68-1.x86.xpak 57237230 BLAKE2B be3156a79fc45bac92220f715e0e7270c060545f222d01fc24ff5bb6a239d8187077f6c4beba1d18c704c6e858f36b22db6f1ce9ebc737e574e9130410d5c813 SHA512 7ac97263d05bd70b29388d749786788124c6e636a3b1e975df8c9225ad3106d66a93898ce1e6cffefc4ec948a36830cfd3ae16dade66d3281bfebdd3a2bf6f7e
@@ -63,6 +69,8 @@ DIST gentoo-kernel-5.10.73-1.x86.xpak 57234727 BLAKE2B 028eec3d6f13893ea7e90fc5e
 DIST gentoo-kernel-5.10.74-1.amd64.xpak 65523300 BLAKE2B 3f764dfcef5b0fb8d2f5fc6217b017245689fddd553db237345e534babcc82e6ee928ff15ef29e8cf5e8aa0ef91c683a077a133e40275c0a4b8fa322d1bdf499 SHA512 8cdc9cef68620fe70acb0af49a36df9a12ddb00ec0cce938f40eec9a259270254a29f06dabf0b8ca3b8796c430f4b6088f233815d2a15f14243d4432ecdd489e
 DIST gentoo-kernel-5.10.74-1.arm64.xpak 61290653 BLAKE2B 24778034fd0407e2d33d10de6c69331493cbdb284fb9e1dfc3bd05efe806bd50e1186325a25a0e646e68d2ca57c9ce05460057020fa9f3c7c185918e465ada16 SHA512 45109b2a2257be9be186989aa34b10801434c05c3e4d5325a29d487116502f2a3680764188c14900157ebd60c317d2e025abf08b0c941564e6e5fd6e76d5f23c
 DIST gentoo-kernel-5.10.74-1.x86.xpak 57252997 BLAKE2B 517acc2cb011e325c1ac41f75f8da1fd1187f6b47359b2fd67171ae26e239a40ca26beea926dd490ed116e7b3956bb29d2f8e5a05c95ac3c6d6341751fc6179f SHA512 46b62a7767f056cb530373a090847ef37991b96b1931daa2eeec49c00258d570c9d859477ebc5afa3cfce2cd7245e5df869c41fd4090cbec2008e0dad93e8e16
+DIST gentoo-kernel-5.10.75-1.amd64.xpak 65510827 BLAKE2B dbca97ddb2197b77dedc46b5da6e4239640268468bb491ed5a001a9e8f7b2354cea75533b5202dfd05356796a30703c23be6975108d850efd228871054f8fc78 SHA512 39673aba230f8882444adc4ba8d77697f02e08915808ebeb0c71907b7a5a8bd750357dc266d5b89165c0bcc47126f7ea7be15481709bb4bc918b9dc15c94187d
+DIST gentoo-kernel-5.10.75-1.x86.xpak 57249997 BLAKE2B 0ef78af722f9c89b01c7d3cd1ffd8dfd10f2358bb62600e3210bbb18f71807f82bf442a3f402d5140fbb20cb1737291470551cc690916ec2b61e9a0d20f8df38 SHA512 08894507e35934970bdd6ab30725db71208abdf00e438ea011c1ecc4f57d5f2b7bf0a3375e0721b241af1e50f4086f4b1a503e5f38b4c1790e9251913ee0347d
 DIST gentoo-kernel-5.13.19-1.amd64.xpak 67338326 BLAKE2B d9e718a94bf9a341f5b57063cbde2f3f1f0ea6d03f1805051c084b792388789494a49786d643f1570871ca2b6366a206497aed83f9ed00837c542ac970a71fc6 SHA512 aea74f6f39861752f7a5dae16d955d541f65d3e7b8a0e5fba593011d9ca8583f3dd0964e76aa21daa6583d5d26e3616885aeca8a04dbba222e0aae2a85062b40
 DIST gentoo-kernel-5.13.19-1.arm64.xpak 62747957 BLAKE2B 1981ddb4e35d2210e1c678856ac58e088cd100ecbd70d2b5c88ffe8eb25b56f3f0c90e45d12adb74c7a0fb881dfd36b1d46d6fdfb837dbdff1881ded066b906d SHA512 d8c1e524a3e58def5352b3faae07c42074a2d67015cc62b9601e20bb9b7f29d44d2843e7771e0399e9150be1de2be2b28776f96f7fe75ba7ec4e8f2c31e1f715
 DIST gentoo-kernel-5.13.19-1.x86.xpak 58517020 BLAKE2B 1dcd347af7693696f93f7a28326aff4c7936c4b71238500b6dd2a4b7cd2b88891436c7c8b7c6a56f638182b722ba5e75f52a1befc74eef4bfe9e6f6fd7d8ef8e SHA512 7bf1cf45d06cf4c6331d8d0c0378d253f6760dbd2f564cac6f7e53d30748ea01ea2d96a6c409a0d653ed74366d319e28ae1e2924b07f4ce7899c5bae121a3630
@@ -78,6 +86,8 @@ DIST gentoo-kernel-5.14.12-1.x86.xpak 59179955 BLAKE2B b94956dae8d21e1a538252f40
 DIST gentoo-kernel-5.14.13-1.amd64.xpak 68024577 BLAKE2B a43710471bae30805de6110dbc52f93ebe618dc68e3348717e22296ed7afbecc2657e0d4eb05b177d5f1fc9c0d6407dc3310ffd6021baede0f02540b02eeee15 SHA512 6576792ce0a46829782dd380392fcbb48b399b0f4b649e17baff1b0e0487dab81e4065eb5efe9e41919cd4e43c3c2b5ad5141731c9bc19f765ffc6d0895b49ca
 DIST gentoo-kernel-5.14.13-1.arm64.xpak 63344405 BLAKE2B bf8618ff4614665383768fe5cacf19277e6283d6c84893a4e4c05b55cde8212c019c9a278044146fb3aa7b52c69f74c94c614e40b1b8fe59f2cc76662ae357ca SHA512 029c1b07c39ea2d95075da59460a864bfb2767675cedd4f1bafefbd61fd084c1d9ad8f3cc579e772581c66b78af44ee386b6e2839e788bb62b45a49557d4b56e
 DIST gentoo-kernel-5.14.13-1.x86.xpak 59170584 BLAKE2B a24893477ab57d178622f1044cc43b136cd12b7814bff1b956c0c1a7a34195bc0d00e6947fd7e0e22ca82b7ef808b164f1577604a373e96a614be4e56d46899e SHA512 d26a623023f79c14964b8a900640e68a870bf3a920cccbe6a9b4d172414411d805eaf6336cdc6a8a4b205b128c08d1c1d9a5953bf8a99a4093dc43d6dcdf3951
+DIST gentoo-kernel-5.14.14-1.amd64.xpak 68060210 BLAKE2B 979f550a50ff3a47e816ea61b5da162bd529a2b622950fea92ce2fd042afc5848468674a02b4b5eb94bcca40055270688f7fe20932708b777351d62bbae498fd SHA512 db752a617cbf86a0b483a2906765198c2b72bffd0a9b146a7ae751c48ca7f600352b173c0574b3ca71e9077183cb92f2b53b63d594d9f355677d1a4b63fc2cc4
+DIST gentoo-kernel-5.14.14-1.x86.xpak 59175659 BLAKE2B 4233bbbca15ceac5a1b1e6880eb77f0838a7c6244d8f9ede2e5057c97c80b317572af6b076a51bd32f16bd4640c61cc3c5ef7c92f78d0f499372975b6fdfc2f1 SHA512 79fc5ca7ce6c6c9a06c48e0857e4d0a964f8d8ea42a48b4f336ac5b017bd3a8aadda7ad6dbdc2984ba8ff2b748df386e2b81240da20a55194947902485dce790
 DIST gentoo-kernel-5.14.7-1.amd64.xpak 68031586 BLAKE2B 7cc01200f01a93daf5f0c84b09e066474dc5dcef76ddadf5e43843a3bb8a69710134ee9546cbfc6da0149b96e480d59cc0ceb610608c7e6710dccbb9e9e185f2 SHA512 595ce0155ef9df5809d7c27ee310d3978bde477e6778468f467c9f07a60c43dd7ce6e39320d3e298639f01c18cfed5811de480d0afd884586d13f434c533fe6b
 DIST gentoo-kernel-5.14.7-1.arm64.xpak 63383693 BLAKE2B d8780cdd6306f36530d82b9a5b6a74e1d2caf9c4e9db31d6816020bc9415fe92891e418dd08f89628f3d36189c84f97c10b570091c2d1a94a494f37a21286706 SHA512 90ef111ef0ef68dd362c458c9e6ea15959713118787ebd8c68492bd204da83a212e5def456fd550c3f175565c262581855599adeb34692c65f54c2f2d7f1d06c
 DIST gentoo-kernel-5.14.7-1.x86.xpak 59157603 BLAKE2B 2c8d5d3786f9b2aa77d0ac7eb4b3dff0d534bebbd974ec43b8b1e7e9322d3a1b9db0554ebb3bf6943f00673e087bb1067f14d341836012bb46774e5b194f1cf5 SHA512 af337483437a9819d16235e9641cb3f9893e140091e31a06ccb1015a6e946189defb5b2d2d12afd19dffaef1828a2d101b01798f107457a53a93ada2d063f023
@@ -108,6 +118,8 @@ DIST gentoo-kernel-5.4.153-1.x86.xpak 53168275 BLAKE2B 583f450220035bec5e718e225
 DIST gentoo-kernel-5.4.154-1.amd64.xpak 61399049 BLAKE2B 1cd9dfa937e87a8e1ec35a2e76f761f022a3c0ecef62c8d62e1a6f2e7972b0e7684bf543819e1c395df0b421563c876de0a29ea8a57b88ef26f7ed394cca7a0b SHA512 706c3dc11604646c29174c12a94afff95f3354b9f658d66591f263dc1a45732415bffb4aa3ed116ba999065feb94723428a5d259cda7bc5373da2ce79c2f3068
 DIST gentoo-kernel-5.4.154-1.arm64.xpak 58059965 BLAKE2B 434c37aaba83a7eaa88804b0d912e6a5ca6e4cf3b3c3a7c3096c5363471c6bda6b541c6d8aec8541bf3740c532fe75b4b4b80076cde642c813a82b18be6140b0 SHA512 24a064e19a267d5db1426f7484ec0210baaef5343f507a037cd8dc01977612878d1ddf9c0c9c953aef5761ae06c716390d77ce9a86c181db6ad8a7a89fe6d510
 DIST gentoo-kernel-5.4.154-1.x86.xpak 53175292 BLAKE2B e6a37169fd36a40f766c3f45f1a85033dda4113bbd7167d7946dafc9f92ecb4393609466dc8f338c9ca3fdcb18c82210e9506a677bcd8f46bb3bb1b5cae427d1 SHA512 8e88fcf1201db8df51268fd1ce13cf0b534919c12426f1754d140d950a7b87b726d44d03782f3bb32738ae638c35290bda4ba682d788e90798694ba9ba135bc0
+DIST gentoo-kernel-5.4.155-1.amd64.xpak 61371926 BLAKE2B 364a34d96863cb9dd697e12fff4cf9a81cfe83e11f8f07267bdcb8c43689535455961579651ec79d93f48747e1a7dd2efe81ddec4119091e93ecbbf53c418e63 SHA512 be177c4f0871bdff50fc6a61403b56bd01db1a5cefb4a489c50484e20d131d292924f734d66ecc1cd4284095b3867b19298b49fe0c3e05373a67100182ab2f36
+DIST gentoo-kernel-5.4.155-1.x86.xpak 53166974 BLAKE2B 635e9b254ad3393c546e8b7dc2934aae87f9dbe99faac2bf6852cfb1a15fd9dbd1c8149fbf07a008eecf5bd07ad5f3fac11621c2cab20f265f0966a887d25cd0 SHA512 ee47f76adf7658ae9154c12f499f58c8caff80f89b0dc9a1d0ea7a5c547d0fefb4779d4a99c3808010a25e0e04dc4facc3ae71d2c46515d690a5fb026695e1e3
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.75.ebuild
@@ -0,0 +1,117 @@
+# 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##*.} + 6 ))
+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}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+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-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild
new file mode 100644
index 000000000000..c31025c57600
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.14.ebuild
@@ -0,0 +1,117 @@
+# 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/~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}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+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-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.155.ebuild
@@ -0,0 +1,117 @@
+# 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##*.} + 4 ))
+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}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+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-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 266bd5c72be5..fe978d8e5197 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 2da2a130876482ac0c4c2959e4fa
 DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504 SHA512 538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
 DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
 DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
+DIST genpatches-5.10-81.base.tar.xz 2412768 BLAKE2B fe3b30c2ebbf250eb62c5add14310326a72f01705c010b202768f37a29e6acff39bec319d0629450c0efd3dc69e414a0b6e541d95283f619e5efb425655d8329 SHA512 544e4af48bc55de74ea145a3d01392ce8742faa88580946c16530575512d8f0b7a6e152755c7bd96548080dfc5758a5a33d6b826e97f75a783e50f361f1852d5
+DIST genpatches-5.10-81.extras.tar.xz 3844 BLAKE2B 9774afc1d893bfa0439cebb0d006cf1c0682571668e09adbf97df38c159f016176b8db538562e896a3ef0380e7ab830503d952d8448b2bd02adb22e84cfa0bea SHA512 c450131db06e63521ec0455a76bd4005f62527e92c0971b63e7076f4fdbae41aa6f4648dd5888bcebaffd41c3c5aff99d99efc0531988fdb54cc9bd3af1bcf96
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
@@ -24,6 +26,8 @@ DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6
 DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
 DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
 DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
+DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
+DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
@@ -42,6 +46,8 @@ DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff63
 DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
 DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
 DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
+DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
+DIST genpatches-5.4-159.extras.tar.xz 1788 BLAKE2B b3bdde65db00da9eaa5e9d3e1a813bca63304608d61af3c4712a5588fe946a9c53974066467af1678cb7e44646dec35ea607133911f1da2e8a4320118cb44431 SHA512 72353c4e7a35c2513bc9d27888050de1446ece8cb9c079ac03ff90cd855070c31001e37f741c42a2b3d2a76890913cae9cd12b19f2250549273b47667b55435f
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild
new file mode 100644
index 000000000000..8a97f9b5278b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.75.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild
new file mode 100644
index 000000000000..b7a0d9f34177
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.14.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild
new file mode 100644
index 000000000000..ef8b4347c4d2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.155.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 40b628fd008a..dac26dfbe862 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,6 +19,9 @@ DIST genpatches-4.14-260.extras.tar.xz 3652 BLAKE2B a132c566c43ef88278b7cc9820ea
 DIST genpatches-4.14-261.base.tar.xz 5311832 BLAKE2B e6401c3353e531daab7ce741b491f49cca6912ac200751f67a55373188a65f92925b1a706a1d46aeac6f6ad5c5de3caad3bb5e11db13021f58c88f96ba94bb6a SHA512 901f87fd50691c4d5f27d73c1bb8d65065435a1848311cbcb27ee94a2f108b4073e2b54575f861050c94d8738b9857b7135abdb094aeb8a5f8e8a242bcb34151
 DIST genpatches-4.14-261.experimental.tar.xz 5712 BLAKE2B 96928274db362c7407e9c07dd377feb656536abda0f0e484bf3ddc42fe2f2cba6c9aaee3906978aeddbc78847fc2fe6f8e62a6961f45c7cfd34e4c48801fdc97 SHA512 7f07d424bf0429c88fb87db3398a05464cd66ff57969503caabe58949e3e76266e37f00b9b07c3b703ea286dfea74ecd919856aa5fcd31899d02b2a024677e96
 DIST genpatches-4.14-261.extras.tar.xz 3656 BLAKE2B 7a1404ca6df41fd61f134ce840739f5dc79e2e80393b3ff23a83ac547b0dea729ca8073a5748da071f35972070cefbc096432cb8038a23b28eed00da25b6f7b5 SHA512 c92cbbb55579c2a46a2e9f8a71e7746e9b5b8d0d978fefaf04e97cc041072561c0e526fcd9c84b576ff30ab97604ead20dda9487738e7850e7e9b697d675afe1
+DIST genpatches-4.14-262.base.tar.xz 5317164 BLAKE2B eb48afbba4044f46cad94311a27016b66eb57858ade7925f3b3e789bf6625895108abef09d95a4857ceb84978ebf6516bf6d4c4fd768bc4849543a2ee043a538 SHA512 4938b0c06c23c3b2699d40f74df5598488a07404f9c75e1403fb61ff2e583e1f631f15d4559d57f4586e74239507e82029de3106a377e04f4f62418a16649105
+DIST genpatches-4.14-262.experimental.tar.xz 5712 BLAKE2B f1cf72a44e746b4948fb4f98389098eec1ad979ca5d1b23a3859219cfd4e94fb4e21e7ccb7227d3b19e5633a35dbb2a92c1990d3bb988bd5b33c9df218f4cb42 SHA512 ea826530ae20655338db823fd705148b06abe133d9149a0d55261c3ebf3deaa9397a861af10d82ea8fb0dc4bcc6a2f2512af86a12ba430fd2a59e2c079721a90
+DIST genpatches-4.14-262.extras.tar.xz 3652 BLAKE2B e81b1597518d7548e2d0d4ab755f8a8455cda471afaa6f51a72a21bdf5671b684f440169fe8aef111b1255515264209592cc3c671dfe032f694470de4a2f7936 SHA512 781d1e84996323fbb6114e7a3e6efd56ff73369dd5edf4af0498b1b0beefa8ab0c933966ebdea156531f0a079870bcc74db574719eb5ca6e257d84bb287043d6
 DIST genpatches-4.19-204.base.tar.xz 4899768 BLAKE2B 9e2721950d6786628639ce06c774df260120f3348abee2104c181515727f1f0276d8abc05c15993ad425ae0c4f85c14c54f1f946137a9ac50c9434e61cec4b64 SHA512 9dd0c810cf68ffb802e1fdbb538acbe8bc56a03bef36099e29187cc0945e6c539f7f85b17b4acecaa8f7d14492cd1c59cd1c1043891429d7797f842763c32db1
 DIST genpatches-4.19-204.experimental.tar.xz 5464 BLAKE2B f913b92f4f6df5f4c0696d6991406da1dec2fd5d70a54a8437b29201104b4d7301844c834cb5184bd7aa29d3359186f8a6e6646260cec4bd49b6480cc202cbd8 SHA512 cc7ebf9c8e7813bdf4f9d0ea19fdbd62b66b5507fcfadd421fea1fbf417e0ae4c30da81f3ebadfbcceed60fdaf8f617bcf249893ed620bffd2887860ae0f21a2
 DIST genpatches-4.19-204.extras.tar.xz 3672 BLAKE2B e9f384f8fe5caf179d116a04064b9ca93829d8a8c00ea661edc84172e3c55da4f1a115a212472bd4ab89342294952e4a12dac2b902fb10419e12b5501afa1c05 SHA512 b59d52624ff422f8b2946d5c73e835a025f602858d42e86f5b124ad4aa1ac126e45483386f66f4f74ba3442be59987b6a94559cea01f4b2577a9aad21996a1c7
@@ -43,6 +46,9 @@ DIST genpatches-4.19-210.extras.tar.xz 3668 BLAKE2B 1a6056967b1d2f829b6932f4dc16
 DIST genpatches-4.19-211.base.tar.xz 5009536 BLAKE2B 3b41949811bd6b6f16fef6cb7ed834130b999c0d5bbb1c23c38569d33d0dc7552737fbda8fdc1fc717cac879ae8a7e987b826ecb015648cb78e8f2ca1268a1d7 SHA512 eb14f3b869253b3a0be00dde3efb87a2ccc6a177140af208c696d4f405358e28f3611ca4cd7ae21e20cd7b369429ca45ccd4cfc46672ba09f36b87b909f753b9
 DIST genpatches-4.19-211.experimental.tar.xz 5460 BLAKE2B 87c43f93aaa66325bb0ce713afc4cdfad341e7def1cbe9bbc0715a2b6a2d3c54e38c313cbebdcebe1e8d1ea14d5f6083719aeca6e39fd92ca58b50df81d5dd67 SHA512 47e91a6f62f3ed308431e5ed0121e0d4680e7669d56d1774bd3d3c58835cfb9025f09a2ff43c3ea567dcb05bdbf9be1eee8f3b1d7645ab11305f1b65c7e810d1
 DIST genpatches-4.19-211.extras.tar.xz 3664 BLAKE2B d888457856216ea409034115c13e51ec49e7271dcf22b0029063f166bf53e1c87a715f78a016e637ebbfce8b884cdb6c7be8585b959a185720640a6bbe427df6 SHA512 1394ce90002e6f9400550d573336624a95adaf8bc5d8f54f5975d90c58204804fa15e3095a6374eb71833e3b641fb30d4cfecbfebaf02bc95ba43aa05dc5dba1
+DIST genpatches-4.19-212.base.tar.xz 5016308 BLAKE2B a7255df30a1a916a1f5407faf59835833b90711be7c2da1500a45d0f6221e164634f838b134790c6d9ce51b0b8c5e1755e4a698d7c6e002396edb41841f0c6c8 SHA512 d7980187beae0ef41dd1e6955ba60d2ee3fefc357aa26e1a6fa0076f3be2d5d9560d16ac94b0f03161c99c43f758c8d48f13a53f562a23f15a1df1514481f801
+DIST genpatches-4.19-212.experimental.tar.xz 5452 BLAKE2B 204ca56c869cbb2b257b7f25db567fa328ce0f1ace459dcc5f94f6bc48d7d496b463b99c1c00358707f03bde25d5ff695d7377753b18327e9b656b9a4d29915f SHA512 93efb4f53b308d69a89b567f123e6ac5604d30bf2f04e130bd8279f0ddcb4c4c191d36711c991d7aeae5bc8f794b816360a3be83689617f18bc3fcf81b4b0dd3
+DIST genpatches-4.19-212.extras.tar.xz 3664 BLAKE2B 3810092edc8ab33dd363bcda2e16b100d0bb22f6071b535c744ffad36c7110fe66cb153fcf6b44a84a2db4e7e27284acabd763be952fa6fc15766b53d2efb27b SHA512 0e907c51c5c877ff60ea53171080386ea61544842000e1a7f51451b22d005d8fe797ea897d977ccb93b230567cec26cd05b8e0909b33c40512be47608ee89454
 DIST genpatches-4.4-284.base.tar.xz 4258176 BLAKE2B 059dd90c9fd124578a3a4458eacba00182f8a988b3ea6af485e166e41f07d9a27e40ca58cc6480a95eb089c455f899ef3439caa3786116db5b5bc31dcf1cf898 SHA512 0526b7099325edf5b839b50aa3aeadd96b8b8baeb6c1bfd24782f7ef97943822dcd97f0dde7a8267e68290977d910079dca41b6bd0389460f4fc238c53ce1dea
 DIST genpatches-4.4-284.experimental.tar.xz 83308 BLAKE2B 1cf0bba71dff6ccfd67a5f8c6c4cf129dae607b7b5d71b2037d6465e88caeed9971ea332053a4b898ae74648f38ef488452006f2ed315a6b0d93b307dae88ef0 SHA512 b9ddbe6f93f65a4eaca48b1731cdb0c74890c8f3f9be390c75c8dd6aeeafd2dedf440b06bdd781d0c93a8873c56537a514acd696bbf46e921e84ae42333dd22b
 DIST genpatches-4.4-284.extras.tar.xz 2132 BLAKE2B 7eb8440592baa6d6a6ad5319289597eb23dad0f95baa3aabe6d753b2ccc42efefb2cdf67a08a9affd5793a0667a775467ac0c99385ff137166d8b08c43591b9d SHA512 fe4072ef93657764dde7dc8adb67085df3c9ce3b645f68f331f2f929d38e83d90dbab68053423b1640a0a0ec5c4620d823403244b0ab7e600e5b573db520520d
@@ -118,6 +124,9 @@ DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13
 DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
 DIST genpatches-5.10-80.experimental.tar.xz 16872 BLAKE2B a0250b00329c40e95104061ac18b8177e784553a8c3fc55d7fe075d8f864a56e86c4b59ac1eb812d3196d03bf76cf7a8fc42225735b11896db28e72ae1bc6a35 SHA512 c9d4ea2776d62ec69152f1fd1617d3265619d3605a9d328dbd59a085547137a7be49afe95b6d9973702cff6c8708cb51a482a1593cbb006a97f3406ad93f02e4
 DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
+DIST genpatches-5.10-81.base.tar.xz 2412768 BLAKE2B fe3b30c2ebbf250eb62c5add14310326a72f01705c010b202768f37a29e6acff39bec319d0629450c0efd3dc69e414a0b6e541d95283f619e5efb425655d8329 SHA512 544e4af48bc55de74ea145a3d01392ce8742faa88580946c16530575512d8f0b7a6e152755c7bd96548080dfc5758a5a33d6b826e97f75a783e50f361f1852d5
+DIST genpatches-5.10-81.experimental.tar.xz 16872 BLAKE2B af57a369a55a923d14bcde19f207d62a8e23bd55b2a497fcf37bd36dc54031c8995fe03e08d5ee039ce6a2c391ac4c98d73d83179aac17fdf78ef9853e6c69c0 SHA512 000c18763a51b7317a9106f660ea6165df1b6ae91c8f65fab98d4b1b8f68f5afcf40157f4322a6245f0aca8563a14138aaae35557c152b13492127fb686e0621
+DIST genpatches-5.10-81.extras.tar.xz 3844 BLAKE2B 9774afc1d893bfa0439cebb0d006cf1c0682571668e09adbf97df38c159f016176b8db538562e896a3ef0380e7ab830503d952d8448b2bd02adb22e84cfa0bea SHA512 c450131db06e63521ec0455a76bd4005f62527e92c0971b63e7076f4fdbae41aa6f4648dd5888bcebaffd41c3c5aff99d99efc0531988fdb54cc9bd3af1bcf96
 DIST genpatches-5.13-18.base.tar.xz 753548 BLAKE2B 2aeb182e609c2043b87a146b912c7a36674b87451d7d469e8538e070ee0b388cae70bf040341798daa7723aae5f490e6826c94374af7a4d1817e1ece54f6279c SHA512 b795d49d7f386aba7c35aa5a3b8ecb1e9bbcdea424aef77251cea12d64b213410c883fcf58e9131437e78e5c63d435d84d8c2834ca5a679f65b7807b026d60d8
 DIST genpatches-5.13-18.experimental.tar.xz 67316 BLAKE2B e2bd9772cf178f3de74c8241af33e5fdf58249a1168262dd123a81ef95b41dd51e32cdc32f2b6b23bbe7812d87f71a62887e9dba33860c0a3e7ab5a122d152bb SHA512 f3a00f8b3c8614ffa6c71feb1c84638aa984f7d4ce36026d83a9dbd691b83497a9178157d1ee17044a4b84fc252fcfd6aa0294d13eaed17dd1ae08a73a30ac44
 DIST genpatches-5.13-18.extras.tar.xz 3848 BLAKE2B f4649e2c359dbd01daa454b1a63534f3347b21e8746a8ab72e6485090b7a3eeb6cdc68cfd2def0f7cd86410f075bd7ec859176c9286d247870a4532f035e45f2 SHA512 963288db0a789baa4c8e588ce77a53391146071738e56979119e83cf10eae176ec49c8a084cd6057ad2c839ad2b19bb1b09790abd05c40f8906a973bcdb87f76
@@ -142,6 +151,9 @@ DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d7
 DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
 DIST genpatches-5.14-14.experimental.tar.xz 67620 BLAKE2B 14b58390801cccf96eb3ef04a199c56c770e2a8b24742d1fbf1412e8de461b2472d503c7ae53e74fd67406a9f51f649b7c406fc65effe28a4dc6679cbd871688 SHA512 cafffd23bb97810bc9814abd682c6cb055ef76bc5a1ba02816332739cdb80f964fd52f03f647f60327fa545e2c3ab09db860ca889ef8961887b356d63129693b
 DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
+DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9bccd97945fd23833f901f81f21ec0b6a114ecbcdc6188b7283f3daf2c2dbb77b470fe4dbd15e6197dbecf1c026aba0f09b5 SHA512 963eb0f6ee49360b041e748bf096ccb4e92a075de029fa65884553f3372c34181f3cd1b1d10c55893df0efda0d4e265cc410ee2d5bfbb6a4dac0be98dc86a638
+DIST genpatches-5.14-15.experimental.tar.xz 67624 BLAKE2B 56095434d8ad2ac42021dce81b59700bfb9c1d190c494bfe9267412c8eee012d0385ed0658601e9d65f2ac5a8d7a64d786c2b31a6ae9d62c23c53db02ed1dd12 SHA512 9753fad6bb37524e851f5a16e2f9dbf363b683c2ff955ddeebe0a2b29ce4d28277770470d6af5118fed4310940fdb79703fdb9ca89a0736d903a21c08cceac06
+DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
 DIST genpatches-5.14-4.base.tar.xz 20400 BLAKE2B 2b0781d16dcc40dd8db831fca56c87e4edf29f0bb54a75949eb251eb98a3da1f0f635cd37ec887498ab4527071edad95f2e22d742aa37e3a1957d5eada102f43 SHA512 48d883b13c1ece3c62a3892b4d06bf1e14990e4a6ec62ca0b96432069a11f05fdb51c3d62187fd8dc70adbf7c93d18aefcb496a4d9be8d42bc9c9dcb52aaad5c
 DIST genpatches-5.14-4.experimental.tar.xz 5408 BLAKE2B b2ce3ee820369e9060a6edc646636f6c4056ef3050b622d0047e80392aec7da59b7b56c2416a2d83ce95c1aa75c10378d9a5723ff7c0537ed81d882b235db91f SHA512 fc8954f3f7d3d05583a748ea43cd0a0e182f8963ecb9bb73e3e4b722de4d6bd79930ef27100b2f4d4ea93742cb4d98bb69f9dddffb931d2fb9278ace81ffd2a4
 DIST genpatches-5.14-4.extras.tar.xz 3848 BLAKE2B b7ff12e366e9db24cdfd67da87e3429b2d39cd7d13fa6cb1e780e59a54fa465641b0b6440c51306cf0f4ccd3952f6f4e8993200f29f9cee36b6be4e84b014291 SHA512 99b0d40e43236e77f188608973e30cd4f1562f6d90c1f71fd95fd9b0e8146744b3b8862e84b9b33e69193cff0a7223a0e9f25cbb030a3f80e4c2d86ac6b50873
@@ -187,6 +199,9 @@ DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d
 DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
 DIST genpatches-5.4-158.experimental.tar.xz 16900 BLAKE2B e8c9105482be182d79c3f16aed9b5c127791ff2cba321aced10e7af1a970f53b615ed823005ee0211e6e639fc25a566dd150cd300ec2cdcc5b817de661957593 SHA512 21c45b4baef4b6eb43df3a9a75f5c2548abbb5a554c84b06e5e267a315a95ddf6234a22baa4631f83c6767a0d43cbbb20203afa4f48851e4222ba32a88fc7063
 DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
+DIST genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
+DIST genpatches-5.4-159.experimental.tar.xz 16904 BLAKE2B 400a2bc2aca56d9dcae832d27b55834840002c8ecf0e5c9529cd09ee8f0aec651603ec8868a28590f7ac6b8f68e6ea2c9135790c3ee59447e38e5cf3ce7c6a4b SHA512 c69892cb68a5086e1eacbdc1b4e2d42f748b935b563ad069946f393e1eef4be2e08806d0e06145ba8256ae11d7cb4d23741a7b57867a40544fe0425becfa2d38
+DIST genpatches-5.4-159.extras.tar.xz 1788 BLAKE2B b3bdde65db00da9eaa5e9d3e1a813bca63304608d61af3c4712a5588fe946a9c53974066467af1678cb7e44646dec35ea607133911f1da2e8a4320118cb44431 SHA512 72353c4e7a35c2513bc9d27888050de1446ece8cb9c079ac03ff90cd855070c31001e37f741c42a2b3d2a76890913cae9cd12b19f2250549273b47667b55435f
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.252.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.252.ebuild
new file mode 100644
index 000000000000..7553c28608e5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.252.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="262"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.213.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.213.ebuild
new file mode 100644
index 000000000000..cc8f5b67dcb6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.213.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="212"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.75.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.75.ebuild
new file mode 100644
index 000000000000..11693fe8e4c6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.75.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="81"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.14.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.14.ebuild
new file mode 100644
index 000000000000..a731b6d1f7a3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.155.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.155.ebuild
new file mode 100644
index 000000000000..34ef65a16aa9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.155.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="159"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3a7075f03223..490f19493100 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -31,6 +31,8 @@ DIST linux-5.10.73.tar.sign 991 BLAKE2B 7e8cfac025378f5a0f2fdc91815f833350710626
 DIST linux-5.10.73.tar.xz 116436432 BLAKE2B 0f85aa816530ab3f738f4ae203bd681e439002ae2a1fe1ba2fb3238e194d79812f1bd084d76d4ad985fdc94d5c913579336652c0b8afb0f8047fd50e9c2db99e SHA512 8dbc10e67a59c2f416f64891f26e87226dfaa39d0d31274467527be01dbf41d7131832d6dbc4aeb2507558aee07aa41ee7ccf79c09be3add6a40a1e6773083f7
 DIST linux-5.10.74.tar.sign 991 BLAKE2B cb4477a85732a41f3fc565d60ec8d39f6408693f1c6392e39f120d8400b7762202d9fbef03dfaf36ecc2d3ea2406ea0f082637f762ed3b3ac0cd9ea035273ba9 SHA512 50575d27166e8bb144524a78b126dc282d2a0a3c832554b8ee5b2579f9d92f855a080593be82195705c3b9f3939f1743023bdf3cc9a051e5cd5fa29dfa1c7b47
 DIST linux-5.10.74.tar.xz 116434932 BLAKE2B e60d9b8ab3cf30a56617037435dc654db67f2e40918bc3c95bcf5e9e8a85d2487c49cf9bcf909675595f6ce4cf59437f2b328635398dad4ee5b7145a0c9492b7 SHA512 d978359f2d8f3f26dd975acda2caf1107e1b0b784aaba0437a6b4100990e50a6d3333a41647f56cdb2bea2ffb75113952dd6ea1570a2fcc88321254e6539bc6b
+DIST linux-5.10.75.tar.sign 991 BLAKE2B 903ef4871f5329bc08910c62b2e0251f0e9527eab0d697e276ff29049e1c1daf377416607c38efdef1b4202636fec9637d63ba4acdc52256f2a5d529e890df3c SHA512 8a229e019a42de32dfc6e228a6f1235f4ad25aeed5e16fd0552188753a8ef83aaf866957bd618c78372f76f6a345795173708f82dceef11978f3eb1616c2f1f9
+DIST linux-5.10.75.tar.xz 116447936 BLAKE2B 7f636f61ad70c6a23859b8ad97c29bb1526f2f69f2d05e9470dea1ae169b8e9bebb86b90e90d89b7897915ec5de871836e528cfeb7f4b46408200b7e6cb9f495 SHA512 93ebdccc6ce0ede721b67d5f13d6efb80eb5444c5a57b509c24df2bb92ca9afd7662735b1e009ad24d6d93531a9e614e8f5ba14e96d5e4f1d041a5be826d1975
 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.10.tar.sign 991 BLAKE2B 899b62183a8e8d9ca26a5bc789c9c728db18f0fb44b7887ceece72b0ef4cfb99444ad20bc08714fd62e1d8c9a4fc4bc8a3c48bad09086723f205cba821bf6c44 SHA512 cdd41731a8502864a04dc5dc3b21cc2b149015bb7894f2f7ace9b571784ff5ab6d2e7aa48b90fa46840f18edfb7bcfda5cb042f34c58b7232b643673accbb7fe
@@ -41,6 +43,8 @@ DIST linux-5.14.12.tar.sign 991 BLAKE2B 73bcf4394b735bde8c6c3b97489ed22e241db218
 DIST linux-5.14.12.tar.xz 120708144 BLAKE2B 854c3160a327a38ba0e8e35a2952029670429d829e903ba4fda659aa7cc7b88014b5dbdeefd2e0cc95e0311875fc7dae4c5fad825bff72102a894624845acbb8 SHA512 df79d76b1247684e650df48051697a017f3b97ac1c3687398e50dfb4b21650b563ad28c35d1bd9261b65f8f77b6bfe34b3ed0e076a03547b6ed16f6fe760915f
 DIST linux-5.14.13.tar.sign 991 BLAKE2B ae135582639a9da85e98ed274b07c289cfe4eacdcf0f53db31231636615f2518ff3aa36a80fa84c518c56dd4b712df94dd0964f2c3faf19b019497618286c836 SHA512 25aab006df0d2d193ee31ab222c595877516f0960cdf8f7d8507f363baab6d284e83d47f06f3573d1c7ea8743166afdc7db9da9b422b177550bc0975e376ad97
 DIST linux-5.14.13.tar.xz 120704340 BLAKE2B 4bb15634eb047d31173be23dac211ce6f4be77f8929cf4f183290e58080aacd70d6512e0bf3229c6d3badf311411a356fbd27d30d1ea40eada364a76f413228b SHA512 b3c662115585b358a05807ebf4953b0fa1ab2c3002835d8b99b3fb203cf1ff080025d476114b022d2e372f53c3c2d93e5460cffac9fdf450fe6d8b86bc65916e
+DIST linux-5.14.14.tar.sign 991 BLAKE2B f391ab4207b20e9efe0e7ddd40d0b25ae643dc9242f353ad708c0e30f8ec3cacbe531f4c1754ce4c4205906965d5d6fcef2c0349c4d49a4288b60e83194a60de SHA512 85f7811b8647dfa3ec04cadf64602a791a5c750f213a45c5fbb6f326b263d51b0c1d7e86645e6b6bce5342458281786aa43e58516375fe082ee99289576ac344
+DIST linux-5.14.14.tar.xz 120707532 BLAKE2B c4f29298a98cfd42a4ee6d2cc94da5d213e57e1160918ddbb7796c511541a85eeed53f9e30203dc5c9e941ebb0a516b6b3f0b525f93f7752cb22d30f76432dfd SHA512 bd21aee0d84e213c4ed387a9da825594d2d576690d0b82ad6aaf123a1d8340b9804d4e99f909ba39f927c524409e35d26ed175c50d5236a8f3f66c7f5837e4a1
 DIST linux-5.14.7.tar.sign 989 BLAKE2B fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7 SHA512 4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871
 DIST linux-5.14.7.tar.xz 120688920 BLAKE2B 861405cd1333958cb829017b6c1d6692a7256d179a48fad751bb02cd02ba09227ff210d9252c592a99d3820c1fbdcc3a6e133cbed31fdecb68ba9cf27dfc8f78 SHA512 ab1dd61a9e0e5ed82b38684d01fbc5c00fbf28acdd5ee754095a9fabe5a5fca7c220b37f80c2adbdd0bd46be461ded6397e40f7a827ea18035124f06756ad743
 DIST linux-5.14.8.tar.sign 989 BLAKE2B 2987fdf70a35ffbc5a8b63dd821f83e4eee25cea66518a41a91a48d22c5670f497abce18b94ca4a351122c78fd02c240a6a5fe9514873aa396ce2a79ddb83301 SHA512 ff7c67c99237b7f52942c54a9ee1f4a1272760232bb7e65d314484ad773d1fcb37070e404b458721e3d3d92f5849a001479a370c9bc3e5b5c72651ac33d1d8f8
@@ -61,3 +65,5 @@ DIST linux-5.4.153.tar.sign 991 BLAKE2B f7b80216c2afaf39b8060df5f3a5323863bd0ed6
 DIST linux-5.4.153.tar.xz 109167756 BLAKE2B 850ea9fe0b25b4016edfe151bead709f5d1600dce0dca03e72adfbc6e9322d756b7b5bcb1143b4e2561e4c87daf2527c00874764b7a4f65000f38227c066c369 SHA512 63c937238dacf027ec9b78f62253b55731571101daa92b8b55d9fbf4937552372f296c80944216269271ee35214406ad63f4769fc29f3d32f60c2c73b76aad08
 DIST linux-5.4.154.tar.sign 991 BLAKE2B 39e97f6ec62f0828e6ac1b8a8eb3c09cfbc21424cd1698643782f23fe54b6beeddd9a0a6aa35750dcdbc108285094e4dc6063bdb90693cb84761a1df6b7bd5a7 SHA512 fbf2b02203170bb5b7e9a5878852fd90f4f0ba7cb2aa1bff9f4216ae00b606babb85d38ee422ec4deb63e7de7d80df8e39f8483482a75d3cb5b57f1a79aa511e
 DIST linux-5.4.154.tar.xz 109181708 BLAKE2B 87ae65ad680670a26d4acc93bffead3f01ea49af433a9270f057ebca7fb6a7151d8e9b1f32d532cf88b300bdaa3d9d1b8127e3e8aac25209eb776aa0aad67fc9 SHA512 098bc78f454ac37dc3113559cfc462acb912471784d281a9cecdb526411a54043b9b0b5cfe417c4ee8cd281bee0f87116b0b7ff39256cd0f5448fe5195d200f3
+DIST linux-5.4.155.tar.sign 991 BLAKE2B 63934a317fc82788f54dbf8ef29873ac44e1654b551757dbff48c1e28353795b13871708ce7ff743738adc80d958edbea8ab0db5dddfc59774985bd661a78338 SHA512 ad4d8b63bb9743a46f17845e7023ba79e0fd4a36ca7ebefb8de3117edb53849cc807fc48e0a315f710817298da731b504818369c18960debab9b888c09134d61
+DIST linux-5.4.155.tar.xz 109180688 BLAKE2B b803f8d0e212bfcc237097a3d699223aad66aa872806e5bb12c6ce7f8965fac5e1006b27948eebe1f2ba7af88a69582e84f6efcd5156c61a0453e1548313511d SHA512 b79b964976ba9f4bd286806782b7e5e04bc0a73f6e23fa637f347cb466f40537901ce61401f1f5450edf4998dadc49ddabd42e8bb4645e0c3b354cd05ec80682
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.75.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
new file mode 100644
index 000000000000..765b04d5024b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 05604a21b3b4..8b5b6f608493 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,10 +5,10 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.251.xz 4468952 BLAKE2B f7f5ac471d2be76cb229839f734e27285cf507d53acfedb2f731085774fb0cc966a4924b8459d0904af2c5f4afe7ad0eb9481678074a56b2137ce57a596adaeb SHA512 c82e3aec6e99b023f71e0b8fa71c82e342f4a830732cfdf633f1ef134093975cd5a5e81c046e058c9ab639c298ae271ebaebd53656c91b54a6f8aed752b97272
-DIST patch-4.19.212.xz 4284024 BLAKE2B 80ad2a9eb1cc2dc82ea4de2808c2a8e553a059673939824c3827c361221ed0efd483a4ceb1dc9787b2b590f7d98053d5a7c125f371e2c35c521cd60bad81c538 SHA512 9530a1cdc4df975b03f762a2264370aae0a6f430279b3c44edbf8bd22804c592bee99a2502adf1931bdb7be57ad7e069cc407081d6c50dd2de5cb4c9bb4cca65
+DIST patch-4.14.252.xz 4473280 BLAKE2B 16786da7e89b09513ea4ba24bf76e568b59502b14b6aa8a070b8ad2051509a2fa7bc4ebb728e08827ac751ca194d57062b144316edc39247e773773d13bb22b7 SHA512 ba5110d96e7d76f6e8d985a9d1ce8402f4942e0d39ae9cc72b330076beef5d64e2b131b80e27f8ebd1e2366dba72155b34cacf3143b4d774c83752688d567fc8
+DIST patch-4.19.213.xz 4289520 BLAKE2B 65825a7ecd0db4ba6d3aba93ce789afb31e3650513c81914ebba2f4936a0fd63e6d86dda50ab589c53e9c60ddf05667cd23161f652da662f105f35fff1f5158b SHA512 722bd244f88483fe8bcd4d06b6f452bfa06de40f010fe185ba84115395f4ae43083db83ee2981e2747096577f65551fa87e26750ce873fc9f3087dacdbf8cc4d
 DIST patch-4.4.289.xz 3665240 BLAKE2B a0a32c0f23dd956509037f7f72d8e017d6cd2366c33878cc26648bb34a2018e33da03b5b898f223299dc96dbaa1a908d9510f15ba587333a344ea0e3bbd02fe8 SHA512 b4c19b8cab3cc772a0459f01f49f841351fd70d9316a52f17a5fd45cb8a168d8ffe0cc4ad804d19cb34c32596006d8834604a5932bb80ea667e993087d44248b
 DIST patch-4.9.287.xz 4114228 BLAKE2B 23593cd1cde8dd2e25663746174c8ec889eaac2c22b2de22e8e58b50cc334fdb9a03b72c5b94b41fafb14dc8421433a6089ba8f4d6cc8401ed9b9226767e13d3 SHA512 0beef0dcb97e7ec9e983c0e636bea1b7ac420f49c92977614993bd37ac89cdf9b6a486a47857599da36ccc71ebf41b8506df0872718a6517db6f67d329e04b95
-DIST patch-5.10.74.xz 2219416 BLAKE2B 24a8230c30dce6062b5a49103418fcc060bc27d12256aac65152e27242c0becd0325af8e5f8d84909d27ce3c4d2d4acf132ec8efc32ad68fecd1e2418e3cff6d SHA512 3d2625379aea1738612166190c7480db79e15d7a66c32a7a794985c0da2b46965e07dab194ebf0d3441d9c80e6d47dd45b752097d52f135921fa7ac1279dd2af
-DIST patch-5.14.13.xz 497216 BLAKE2B e51417dced941cf9e38e8410ca0220a9e75b901aff04cdc466f4f8cc50543b9a89d8f3a992eb935bf56a1592b596d33987461a2a27e5eef0ced858ab5036e9e2 SHA512 d1925f0f9911edfaf769ebce775afc67ae6b9a99eec557588712bf26b0b65b2c6e7359e12e033e1b1e3556af2ac820efb802b2512b44c2147459806f603407de
-DIST patch-5.4.154.xz 3419760 BLAKE2B d67193634055eba94444c384c624f70189c7dcfce7024f54312be3239f0215c2687e04568359d391700e8b7892a41f56c9005b42ce9e384996c85f976164c32d SHA512 c6b906a73db666255c0cefec4ed5651ee5f7383d9c5b8696d73f2702a3cb43a5373b7b8022b13cd4d86fb48b3dfc57a25f370916b6b6aaa003c7429602894eb5
+DIST patch-5.10.75.xz 2235148 BLAKE2B ba41cc264cdd17e09d908dcf1f8f8b1ab03bb1a49b8b38f2459d450f07cc50bf5f3a4b09bc132d0cfddcc827cd3793b32115692021a67b5b2262e04c3b14f19d SHA512 46ede6b29a42c30f700edf8e9bfe0e2dd82798658443c09ff9a4610946e4b2dcb4868d5cc955bb6f331bdebacd7b9434a4efd63ecd31df05a764364cc3901961
+DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
+DIST patch-5.4.155.xz 3428096 BLAKE2B 963b2aa16b3d176e30ae3f17caa2b2b31c913edb571931879d5a1000c805cdcac41384b7d4654089733847603799c6058ea61cd806d8113d35d66e98a2437892 SHA512 16d377569a362c768dcf7a63d064e2501b6c9d6be19099facc36b391e719ed12b9af558b8e4f690d1e662d3a3cf032a80a89352f620619445401b5b797513906
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.251.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.252.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.251.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.252.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.212.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.213.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.212.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.213.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.74.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.75.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.74.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.75.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.14.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.14.14.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.14.13.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.14.14.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.154.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.155.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.154.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.155.ebuild
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 35c54b0344be..87a3dd894ee4 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpi/acpi-1.7-r1.ebuild b/sys-power/acpi/acpi-1.7-r1.ebuild
index 2f9698fe4fa3..8c19d29de19d 100644
--- a/sys-power/acpi/acpi-1.7-r1.ebuild
+++ b/sys-power/acpi/acpi-1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Displays information about ACPI devices"
 HOMEPAGE="https://sourceforge.net/projects/acpiclient/"
diff --git a/sys-power/acpi/metadata.xml b/sys-power/acpi/metadata.xml
index 7b3fd4fff047..ca902bbafd62 100644
--- a/sys-power/acpi/metadata.xml
+++ b/sys-power/acpi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">acpiclient</remote-id>
 	</upstream>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 70bbb115bcb6..ba0d46ccea47 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/fcron/fcron-3.2.1-r6.ebuild b/sys-process/fcron/fcron-3.2.1-r8.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.2.1-r6.ebuild
rename to sys-process/fcron/fcron-3.2.1-r8.ebuild
index eee51e1d3c36..a9f01c0b0818 100644
--- a/sys-process/fcron/fcron-3.2.1-r6.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WANT_AUTOMAKE="none"
 
-inherit autotools cron flag-o-matic pam systemd
+inherit autotools cron flag-o-matic pam systemd user-info
 
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
 HOMEPAGE="http://fcron.free.fr/"
@@ -206,7 +206,7 @@ pkg_postinst() {
 	else
 		local v
 		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least "3.2.1" ${v}; then
+			if ver_test "3.2.1" -gt ${v}; then
 				# This is an upgrade
 
 				elog "fcron's default systab was updated since your last installation."
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r3.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.3.0_beta-r3.ebuild
rename to sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
index 7af1483a4c8c..07a27b00a822 100644
--- a/sys-process/fcron/fcron-3.3.0_beta-r3.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WANT_AUTOMAKE="none"
 
-inherit autotools cron flag-o-matic pam systemd
+inherit autotools cron flag-o-matic pam systemd user-info
 
 MY_PV="${PV/_beta/}"
 MY_P="${PN}-${MY_PV}"
@@ -210,7 +210,7 @@ pkg_postinst() {
 	else
 		local v
 		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least "3.2.1" ${v}; then
+			if ver_test "3.2.1" -gt ${v}; then
 				# This is an upgrade
 
 				elog "fcron's default systab was updated since your last installation."
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 783aaf930cde..98ee38a5e25c 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/dist-kernel-5.10.75.ebuild b/virtual/dist-kernel/dist-kernel-5.10.75.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.75.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.14.ebuild b/virtual/dist-kernel/dist-kernel-5.14.14.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.14.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.155.ebuild b/virtual/dist-kernel/dist-kernel-5.4.155.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.155.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f3dd6e2b7bde..f00dff76f719 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 070479677234..46cbd5decfbb 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,3 +1,6 @@
 DIST vivaldi-snapshot_4.3.2439.41-1_amd64.deb 88036868 BLAKE2B f5f89adc1e55ff2982600353f5be130ee6b53a9bdf0a85e0898719b65018ae5b6bad7480b38680b4811d1ffcaa30f8e67bf8e19c189f3e6a952499b8eea5d53d SHA512 d5d6b2b96a9f9bb4b0a2cd5a84e01107e23ab06d0895209deaa0b4794d8cc4864c2f9a8d0702a1c35b8192cb1d15a7c1765177a2cc96c9ff3fe7bfd111274b3b
 DIST vivaldi-snapshot_4.3.2439.41-1_arm64.deb 82795244 BLAKE2B a2c39b06362c1d1f507b3bcc97d99309a25d313853e009192e6f51220f3195ef916758566987a7492354e4bab708983f7d191e56f9bc2e0fc4e4f8472afceba7 SHA512 1543d6a92b4577ef70f4749b7cabb21d90202afed06b1292b0c45a3f985d997ebac00959d9d739ed147f79efb653efc904fc721bd9376acb0e6915906deddbf7
 DIST vivaldi-snapshot_4.3.2439.41-1_armhf.deb 78980916 BLAKE2B 0f389dc4922683f3ed60922701b8904026a32c67ec2abd1320e0f95ea797cb4da04e3b9c38d04ba763cf01fb9b7adf9f6c3ad1010eb5df99492880d14dc8e64c SHA512 355059e74c3475c55397167a3905f142b739bf8c4786605e4a642f639adb575ee9d37b4471a77e383ab6dba8712761b33c4c24bba409a4dac747cf34a1acf65d
+DIST vivaldi-snapshot_4.4.2457.3-1_amd64.deb 88064736 BLAKE2B 053bc4e08ae03bef4e28382fcb78be702f4b35a818376b61b47682cc78e2e15ec4e772bbe24a72f75c59c25888783fe4b8f27d35817110b268dd88486fceef85 SHA512 5ae4a7f89f00c5a564d59b3bbb1c93f6bd7b8b3456322ea94cc2b31523c8ce4a21e0111911a50c9710bc2ec9481e6ea7a0c9cb38c9be93f67f86251080736c39
+DIST vivaldi-snapshot_4.4.2457.3-1_arm64.deb 82871488 BLAKE2B d23b6033d373d09ffb1eaebd1b67b87dbc801e08b4f98f5045d85186d718a29db078135a2b5f4b65aa51c2fbcab17689e88cb9a59892cf3484819ab053d4117f SHA512 d96087b582be5da8c00efa3fb63c6fd5f9c61517993aa4e3dcb9cb32ffa10bad33c07e1f0252f1583459d30901a661c4b7e5f2b0c1a33ce006a81521186f5e6a
+DIST vivaldi-snapshot_4.4.2457.3-1_armhf.deb 79055812 BLAKE2B 1618c60831f825cbf3f7b8b6d3d562ae03c5610ee8c0541cea6c4ec8bf78684ea71576c14ccaadbde87a0965772008b6e6baeb34423aa9d0a261a605ca166764 SHA512 88bf379c1f063e0cf45e7681dc50acfd7108f8abe91b8bf782113fa4375f76e9522def41d523e401d321aca06549f0751478ea6c2288cd95294bdb8ac1cb4bd7
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2457.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2457.3.ebuild
new file mode 100644
index 000000000000..9fafe2ed2efc
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.4.2457.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="94"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c4146c753dbe..564ad77b48f0 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml
index c2c24269a9f2..6b15ce319d3f 100644
--- a/x11-misc/qt5ct/metadata.xml
+++ b/x11-misc/qt5ct/metadata.xml
@@ -9,9 +9,6 @@
 		This program allows users to configure Qt5 settings (theme, font,
 		icons, etc.) under DE/WM without Qt5 integration.
 	</longdescription>
-	<use>
-		<flag name="dbus">Enable system tray and global menu support</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">qt5ct</remote-id>
 	</upstream>
diff --git a/x11-misc/qt5ct/qt5ct-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild
index d12ebfa8b546..5bbd45ce15dd 100644
--- a/x11-misc/qt5ct/qt5ct-1.3.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.3.ebuild
@@ -12,17 +12,13 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="+dbus"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=[dbus]
 	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.5.ebuild
index bcb0e53195bc..79f26d2c1bc8 100644
--- a/x11-misc/qt5ct/qt5ct-1.5.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.5.ebuild
@@ -12,17 +12,13 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="+dbus"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=[dbus]
 	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 14f2f6c473f4..3ff30088cc5c 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 82287a8e8c6b..427f61b12136 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,2 +1,3 @@
 DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
 DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
+DIST i3-4.20.tar.xz 1286300 BLAKE2B 297c97032bd91e3086be8f72d476321bc48f9dbea6e45d1313229c569592c9a64bd9c19393d75a9c8abcaaf93d009709a81007b523fe5c3bae52fc1d7e4e7836 SHA512 7b184116664d2c3e097341e8008fea91bdc446a05177f50f5472890289e862fb41a11edc1d2b8d004347ce312219cb3d80c75840d3427330e3f0ee256163c198
diff --git a/x11-wm/i3/i3-4.20.ebuild b/x11-wm/i3/i3-4.20.ebuild
new file mode 100644
index 000000000000..406be38b4f28
--- /dev/null
+++ b/x11-wm/i3/i3-4.20.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+if [[ "${PV}" = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/i3/i3"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libev
+	dev-libs/libpcre
+	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/local-lib
+		dev-perl/X11-XCB
+		virtual/perl-Test-Simple
+		x11-base/xorg-server[xephyr]
+		x11-misc/xvfb-run
+	)
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
+)
+
+src_prepare() {
+	default
+
+	cat > "${T}"/i3wm <<- EOF || die
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_use doc docs)
+		$(meson_use doc mans)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	optfeature_header "There are several packages that may be useful with i3:"
+	optfeature "application launcher" x11-misc/dmenu
+	optfeature "simple screen locker" x11-misc/i3lock
+	optfeature "status bar generator" x11-misc/i3status
+}