gentoo auto-resync : 10:01:2023 - 23:43:04

author: V3n3RiX <venerix@koprulu.sector> 2023-01-10 23:43:04 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-10 23:43:04 +0000
commit: 113cc6fe7a9adc2baf67f9ef7723db6ed2b24887 (patch)
tree: 968fd44d403c54949106d2c90a128f529f7ef3d0
parent: 1fe49f5b3e13481832866b6b1600741bf3a1f024 (diff)
166 files changed, 1561 insertions, 2069 deletions
diff --git a/Manifest b/Manifest
index 27d417f2c6d7..f146b61d773f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29799 BLAKE2B 9e0c5b09cb6853d8acda5cad7df81fb9743397e938771d3e8042180e7165ea23acbb3296394eb8782ac1017dcf1e3916b980718de3a5225e41937965cf66b907 SHA512 e42a5736167ea96aeabea7034d98e675f3b3a0ee06a6c40363d9546bca3b1b74d6d0ce8ccf49b548ac146f25a0029ad1a27544c12f4349ff2bf918ab0093e0d4
-TIMESTAMP 2023-01-10T17:44:23Z
+MANIFEST Manifest.files.gz 29782 BLAKE2B c841b2279084447116294fb315065e07f067371c96f7d4516972b9c4425bb9b98d81821da8354913d2334c1567ed7110ef2a02ced407a8b09fd2243319e9edae SHA512 8859433f5b3b84721b1c1f550061f2399af44133b998d7efca4db892e13849c2ec5a5ddcc33cfa15992123df939d0508f7371ba9d1276ce04d9f40e5ef8c497e
+TIMESTAMP 2023-01-10T22:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO9o/dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO96S1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDX3w/9H6F6gjZ1ua1Th1Je8OotbmuAYsYw4qtQF3/xduchNPmcJ7GRmC49uoM0
-+BiElHyyyGuMjvVYst9Jd7kIu35SG3dLkzcCNnEU0vyD8Xf+sEI4uQycYSN7wRGh
-+4USWYm+dIVqS0BGupDXvOG+VlCwCQr9ehADU0Su8vvAGFaSVyAhi6L2XEnW1fkN
-D+v8mx+xbFe8bZ7AF9jQHRtUbDT86GCikB4GEAU6MhbiFxzFdPa2lD5RwtOs7eP3
-mQo2BvTbVC0g6kbS9WJYZk84g8+pxH2TD/5fOF6lY8lg8wDXDytjWqN5xPijnNqc
-+3FQTU6zZH5emq0C8pzJYq+gX3ani22qb8IZ90cT3mkeIQohotykLz3eklWF9OJl
-/sKnTjSgt0nh484FPcAeQgHoUTWfpqtCAr0wGYteoBzGW8yX/n7Uetc/qcGTkDgJ
-w6QbXLG098jgIL7gjAMcqMbdn+a+rxh0YFK1w4hCz8zQKLUpDP50/pnBR1wsnv3J
-YhonAeX0GAAbHOd2Ol1dzWmtV1GfgukATu5tZ2aIab0A6DHb41VeBAZKeQBcqz8E
-P/od1JWd9T7lclrp4J5EpRG9MOCqO43t0PuOoRozYFDjGUz/wANX/jCrhzZpyJB3
-N8kt6j7Oik50jaUgAbWzRV6XN8FKTbCxTg+vcr7+Cr1riRiA4Po=
-=3Wqu
+klBibRAApF9tgIcJIeTZSzxsFaWn+f18lF1hzZBUzduxJpfcU9Y24OQmlzZs6TsR
+WGW11LcGV2uJyQUGhokNRsoCrdvf0o5a1tgXMc46Ek7kwCeopAdebkEsk9Ly3lfz
+JkaxG0LEdMJV0OO0g9Ojxnik1gQFxoLI6dR0+zSzNfIua9sAnrDKZONwCo2JAiAV
+l7gkRHdTcBUP+BpWxNw/hxoPK4q2veuO4scpgTqzZQxEjLbqq76qbGXbw3Uo/wk5
+R+YtbLOFDPGEJNsqgX8DX1sAB3enAW2F1JLMeigfnR2KuNK7mw8gDc/3t6IVBbw7
+50EjtTkUb9EQfRGX49NkPu/eodrOHRJWeAH6fvjUw16N5MkqzvKLRbdsqP+21AR3
+sm7piE8vcAKkwXcFf75NC74PHHksfxl3lEXYsvET56CtiBvENB2OYoP/zvs1IowA
++a9RrbTcPs82NboekCsIQoMjOt72rHadfJNXx2cqueCFAFvYURHcQM7njO+BM14a
+C9BQvh//Y3H5Vv25k9o7D8sPOGxWI1NNhCa466WesRCKKe3eZ+TajZodgpN3tkov
+8J68guYfVCG0kKWXFJ0RLCXaU6t9OqwVwoRzf/603Kro3qCPaeXYYOn3FNERWvZe
+38w4eXy5yAbw3AVB16nK+FkmBLV7wVEMny3gNRWmyMuZBMs81kU=
+=NSbU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 03060c8718cd..d8ca61a22c36 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 74c7588e868e..9f57ecbe214a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 1b1d51a8b84d..5ebc798ca038 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,5 +4,5 @@ DIST puppet-agent_7.20.0-1focal_arm64.deb 33547934 BLAKE2B 323d76ac12af0c97cf38b
 DIST puppet-agent_7.21.0-1focal_amd64.deb 32897404 BLAKE2B 5075c0c77ae2199a3743edcc7fda94802f7b845b37084a613547705a3dc403259908698036bad95e36d7ba18c8b165971d98b81b64e56e6b40f3360e00c4fc5b SHA512 cad621b9add8c7397c681684696b78d57c149b174a43830c3c45ea1679aba791005b634a64b48b3a9d276fb00d7e1ca8e2a73f6a02756d020914f507a35dc56a
 DIST puppet-agent_7.21.0-1focal_arm64.deb 32630670 BLAKE2B 634fed97c79ca3b317ee079366a262c898ef217236014dc683cf1c11e83f2fd74bc21c18ff5242ebd2a4b15b73852ed727976134f684e0d416ac0a3ee54221c3 SHA512 be6a0566db5b1ab72b8f53bdf061c0ad4fb93794d690c6ebe697c9eb5aae45b7838b266619c5c33f3c4499a7264fb083d3f2bbb1fbf70b73458c8aa24470e3c3
 EBUILD puppet-agent-7.20.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
-EBUILD puppet-agent-7.21.0.ebuild 2594 BLAKE2B 50cf4300e0420105383d9ce375f643b6122562bb5cf6841db7b8009107bc752827be49288a30c9ccce030b854c3dcbedde3d86bf64e9af37cef7cf5b2e521faa SHA512 9c4e4599785c65a32bdf31a7257862c953bd3c7ee1b7db2279bd1bceb9082ec20dd3f020a3592f5bd211e27b55fa8a5ed7b116c67d11c73151015f326a66bb81
+EBUILD puppet-agent-7.21.0.ebuild 2593 BLAKE2B a73b46e5e5bd8f3d8bbd45478bcb311a80d0f2b6ca84c23e13b70ca82820be978912ee1e0019c5efc05bcc2c1f30590117ff1d28e789238adbf085e6fd0709fc SHA512 b5e3e76e28d1abaed04fd2749333d465272aacef931531e29041dc19e6206dbf66bb468e64deaa861348bb36d7d45ddd236d9bc2be84df41dbba54c7f3c3e857
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild
index 3ef55d1516d2..81bc5f74414a 100644
--- a/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 52abfbf9f763..57219da38e9c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,6 +10,5 @@ DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392e
 DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.20.0.ebuild 3464 BLAKE2B 6886a93d04137efbf35c6893c705b161ddd3146a7cbeb1189ce85f0475ddf44ad8287971a69163a7d766c2789c722241a7606777b34fa9eacfa5754401931c2f SHA512 6dad2155b69165abf08c886ac634153602bf651c6a59d73ef79089f2baf8def0e75d6fe719b4b6011a296f88eb6d13c5bc25fcbc56c56d4699a227861765a682
-EBUILD puppet-7.21.0-r1.ebuild 3464 BLAKE2B 79354614dd9311c6c6d90de12ededbf4a87ba99832d31ee9028259607144a4ecf94f97871c3428f94c2232e3b5499c34c438d8646dc8658cc4de6895039d5951 SHA512 205f46e44663cc7a14c8d28615ac5ec1fb987aa87deb78cc1e7828d2c5d8cb3e35eb243a90b1476b1b833187d2534ac9fa42b4dd0a0dc5971793c2300978d78c
-EBUILD puppet-7.21.0.ebuild 3466 BLAKE2B ce3608883ebacb011f099fdedccc247e5d81d4e6e3956ffb1bb25ca4e201fd50fc180a7314fc8c8254ede8a841da3ace83253257449fd3a1d6cba70342baaed6 SHA512 0eee8a3d323b5d4f004fbfe55d8e4387dfa8c13e8f49b34304850b3854e72b3639f505e8ef14ddb14c126f52589cf04f16d0bf55de807aca496af9f4a89d69fb
+EBUILD puppet-7.21.0-r1.ebuild 3466 BLAKE2B 269e35b7c3d6275ce9a1979602804a3878a6e9ec285184496603eb6b8e98a298a19fc178718d2c1545bfcba719b3103d411fdd0f2bbe09e91ab9c7790b201ee0 SHA512 568015d5a107ef7d64efb7aef3b454316d801021e4fa7ab28ddac9b95d1b23a3e2669cc4c72b2c5ed0b1feddc2f6d39d7cae075b5cc9b96259dace4c15ab1ba2
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild b/app-admin/puppet/puppet-7.21.0-r1.ebuild
index 42b2ff4970b6..5d56b2e46a6e 100644
--- a/app-admin/puppet/puppet-7.21.0-r1.ebuild
+++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -74,7 +74,8 @@ all_ruby_prepare() {
 
 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}"
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+#	"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
 }
 
 all_ruby_install() {
diff --git a/app-admin/puppet/puppet-7.21.0.ebuild b/app-admin/puppet/puppet-7.21.0.ebuild
deleted file mode 100644
index c4a309bf4bb3..000000000000
--- a/app-admin/puppet/puppet-7.21.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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
-
-	# 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 1c8c5e8e8480..5a8809566482 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -3,5 +3,5 @@ AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa
 DIST puppetserver-7.9.2.tar.gz 59729859 BLAKE2B 15f9261ae81f280735080a75e083b4bbc5d4b9404bd52f02180173b6cab2ebfe20e38950dd6c94c5167478293056ac562994ff27a7ad955c69621c13ffa808e1 SHA512 0c047554e10ecf36d000c9f702b759e27b8168f1f2207d9b8e904c9579d8e37d8540327d898b0a9e1812ca3223aa15b7cf4da46d7a4247e5d4b8f1596f9d5f26
 DIST puppetserver-7.9.3.tar.gz 59951239 BLAKE2B 818eee0e7bd115e0b335b1e13d7b0016933190e95a3bf71ad2498f87097de4251a1e6e2f9dfb933a1ee49c981ae0adf74f9994ec0e36a4b77aad567ab00e1fdd SHA512 d2ce573bf15c0db7cb7a9fd0a35a8286acc77ca9b2eddfe0f2dd8549034793600c04973d9f8a72ab543282325f18795727e05a723b3a3b67b027b382ded3d3eb
 EBUILD puppetserver-7.9.2.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
-EBUILD puppetserver-7.9.3.ebuild 5356 BLAKE2B d16d614eafd7c9770b1c1b01afa58f7aa51bc5de6055144736a1bce4931f2752861c6e1ab0b0f17a477406b9384e3b492fc4a86d4bdf45ddbba50eda36496c55 SHA512 01ea3ed8ea76519754a51921c9c58aec187192915b3fd92be92df0db6fce8caf78bbeca6af12715581495f85d65c147e6bccdc9b90e3292aad18621e4ce0d4e3
+EBUILD puppetserver-7.9.3.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.9.3.ebuild b/app-admin/puppetserver/puppetserver-7.9.3.ebuild
index 6877b38e3a99..feb570fae895 100644
--- a/app-admin/puppetserver/puppetserver-7.9.3.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c0f4a0a7f399..32fba4ec3c3d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index efbb18752b45..d36e4ae1fc03 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
 DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a8859c9a1b1dbdf62f240c123f20d5a63f01c5a92a4463b99f50b343e6956ac9a53c14c576b16bcd46c07f6f775f3 SHA512 c72d428a43d19b105a206931f8fe74e0c68dfc288a2e8667f25b9e292820eccd9ad04a11d9d3c4fcdbcb08cf2adc5f5fad12bd53b8df09dcc77c0a500a30e518
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
-EBUILD acme-1.31.0.ebuild 1140 BLAKE2B 109016a04482351c3df89e09489f246b7dcd91473521f1e40a9f0788cdab5c49d662d08d32f359ddd563b9f04a86e3f6d365ccee387756bc25a7a59d973d102d SHA512 696444b8ca4de37ff8eead63b5ce500e80ce0315184a28edb21d39988353a252a285f01dc6a57ff6919d0d12352a1ac5f32747c2271d7b447fc814e0427b2c62
 EBUILD acme-1.32.0.ebuild 1140 BLAKE2B 109016a04482351c3df89e09489f246b7dcd91473521f1e40a9f0788cdab5c49d662d08d32f359ddd563b9f04a86e3f6d365ccee387756bc25a7a59d973d102d SHA512 696444b8ca4de37ff8eead63b5ce500e80ce0315184a28edb21d39988353a252a285f01dc6a57ff6919d0d12352a1ac5f32747c2271d7b447fc814e0427b2c62
 EBUILD acme-2.0.0.ebuild 1140 BLAKE2B 58612987f7c89e8c00c7c5310afc2bd29824ff4fa24860cf4daf3ccce84b4c745dcfa6fb95cf5eaa76dbc229b918a48ac7d61a2106017b32b41336ee31f7914f SHA512 1b82f48a978ecb5a1d8ee6b339ea14e96ae8c61bb0cc541a4ca5e3165c2bee9ee1fd633700f6f0897ae8a8baf23f998455ae5ec84f9c305ac80a5034ea87c1cc
 EBUILD acme-2.1.0.ebuild 1140 BLAKE2B 9889b6122d7bd35b8adc8e0b3f3e0aed101d8ad51b32155b35288d3ba69f9bd830f03b6571f37d8eb732bb1589149efd954dc67608eec6a28c9710a4e28f3d05 SHA512 c0d8d2fd1789eec7b05564ab6823942744b3c6a2b36121efb723f47569d20c7420635d75b598287aa2a663a21a28627f4ac071ac0694736b9a23e8871e0d92cd
diff --git a/app-crypt/acme/acme-1.31.0.ebuild b/app-crypt/acme/acme-1.31.0.ebuild
deleted file mode 100644
index 3fb83dc6c5a0..000000000000
--- a/app-crypt/acme/acme-1.31.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index e6892cf12f1c..cb281a21fbfb 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
 DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a8859c9a1b1dbdf62f240c123f20d5a63f01c5a92a4463b99f50b343e6956ac9a53c14c576b16bcd46c07f6f775f3 SHA512 c72d428a43d19b105a206931f8fe74e0c68dfc288a2e8667f25b9e292820eccd9ad04a11d9d3c4fcdbcb08cf2adc5f5fad12bd53b8df09dcc77c0a500a30e518
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
-EBUILD certbot-apache-1.31.0.ebuild 945 BLAKE2B 7a7d3e1c404a796a529707becaf6e166b33aa7afe568d91cdfcd7656b19f61ee712ca2d65055445762931917e680c67f20cda811123b733bcf9a40260970c3c7 SHA512 23dddc9757ee6eab0a131a3a84c441680678bfd27548c2651665cd25a1aade2387f405281eafba2304cec0fea0a71065d1b2b12c3f58dc6fbfc7df0fef2e3264
 EBUILD certbot-apache-1.32.0.ebuild 945 BLAKE2B 7a7d3e1c404a796a529707becaf6e166b33aa7afe568d91cdfcd7656b19f61ee712ca2d65055445762931917e680c67f20cda811123b733bcf9a40260970c3c7 SHA512 23dddc9757ee6eab0a131a3a84c441680678bfd27548c2651665cd25a1aade2387f405281eafba2304cec0fea0a71065d1b2b12c3f58dc6fbfc7df0fef2e3264
 EBUILD certbot-apache-2.0.0.ebuild 945 BLAKE2B b7486d3ca9bcdc7d42a52f1fc7d6a2587f3b1904d12ef829c89aa0d0f9f6b93f808bd8a08b72d7aa20ed026b4cf0913f1edfba84d9b84ef6fca57a03b8f43f62 SHA512 a6eccbbdb305014d161e646784dc8af6efd7ded410f25d449193c3eaf79180654a1d069dbd12a5987bd88641a4740e87f34c61014c758077c394930044d25eb7
 EBUILD certbot-apache-2.1.0.ebuild 945 BLAKE2B ea74bdc78abca2d7c5f6c2ec23b90d37a3003e2a9eae56a93a524384df2fa6dbe791b02946b414e24373478fa250ed3086d5a6d3eb2736c131317ad42b8aace1 SHA512 305ed57220e2ad49f1d51ec537e72e0208d9e84f288cfcb61a23a7966d9ff7519bf469c3a13fd685949c39a6eaf4992277569110469ff20bd4279a218d9acf74
diff --git a/app-crypt/certbot-apache/certbot-apache-1.31.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.31.0.ebuild
deleted file mode 100644
index b69b550d0c42..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.31.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a28c2a403e94..9988762a1359 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
 DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a8859c9a1b1dbdf62f240c123f20d5a63f01c5a92a4463b99f50b343e6956ac9a53c14c576b16bcd46c07f6f775f3 SHA512 c72d428a43d19b105a206931f8fe74e0c68dfc288a2e8667f25b9e292820eccd9ad04a11d9d3c4fcdbcb08cf2adc5f5fad12bd53b8df09dcc77c0a500a30e518
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
-EBUILD certbot-nginx-1.31.0.ebuild 963 BLAKE2B b4235fd8c9bbedeafaf2581fe0abb669d46e915ba7f5b9cee9943c1ecd2278859db1347a43159334df1b0054f0019066565d39c16ffc8b37a484c4de180f4c7f SHA512 38d4c236961c139664cfb7005691695968bb3213c615ff2fea37dd09067eca9d89611f25af8946c434fd7134157f7e593b043833ee0bfe3d4d061448d8caa669
 EBUILD certbot-nginx-1.32.0.ebuild 963 BLAKE2B b4235fd8c9bbedeafaf2581fe0abb669d46e915ba7f5b9cee9943c1ecd2278859db1347a43159334df1b0054f0019066565d39c16ffc8b37a484c4de180f4c7f SHA512 38d4c236961c139664cfb7005691695968bb3213c615ff2fea37dd09067eca9d89611f25af8946c434fd7134157f7e593b043833ee0bfe3d4d061448d8caa669
 EBUILD certbot-nginx-2.0.0.ebuild 963 BLAKE2B 18ef43b8278c51862184208303b881650a15603307554fbb89fa63aedc79ab9e1e416fedbfd9a1830f9ab1dd4ef9aa24fde5c57b7a8c9626d0f698218b4a81a6 SHA512 edf658cafb50a42072a0aa62fd289531e1a51fd3ef7aee3c92803921a78f36b509a7cc12ba58c8e5f554025410842e1a3e3d1a0e3033dd6b147e07532270d0e6
 EBUILD certbot-nginx-2.1.0.ebuild 963 BLAKE2B 9abe98aa8126e74a4c6334c781e11232d9940885716f7f89a37945af5b922105b92dc33b096a08531b0a7190166f2c6dd2757eb2e7c0ce2b7219ea24c12a4dbe SHA512 e54fa5bd4a66119f09a0a0687144e85b3bbfbc6f3eb8036dbe07eee44748081c136f1439c0f59e43357da6e23e105019ce924a352b71c4e342ef3315ba0f7772
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.31.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.31.0.ebuild
deleted file mode 100644
index ee8e964f8c21..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.31.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index f01666d79913..50f58ffb77b5 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
 DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a8859c9a1b1dbdf62f240c123f20d5a63f01c5a92a4463b99f50b343e6956ac9a53c14c576b16bcd46c07f6f775f3 SHA512 c72d428a43d19b105a206931f8fe74e0c68dfc288a2e8667f25b9e292820eccd9ad04a11d9d3c4fcdbcb08cf2adc5f5fad12bd53b8df09dcc77c0a500a30e518
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
-EBUILD certbot-1.31.0.ebuild 1256 BLAKE2B 5fe946cfd4172ae554cc5f1d47460c957c92171a86af42ec567ded30ee0fd45c42ef6629077d372e062f46525f5e8229149d2c3e1d24b2e5824f0306134b9ca5 SHA512 1145bf5344bd778950e0a75496b05b3190729f830d7b9b872a2f3676355c873be39db236ed4fb39f8d454588cee3cdde900321903b444423fdc43e171de6b5c0
 EBUILD certbot-1.32.0.ebuild 1256 BLAKE2B 5fe946cfd4172ae554cc5f1d47460c957c92171a86af42ec567ded30ee0fd45c42ef6629077d372e062f46525f5e8229149d2c3e1d24b2e5824f0306134b9ca5 SHA512 1145bf5344bd778950e0a75496b05b3190729f830d7b9b872a2f3676355c873be39db236ed4fb39f8d454588cee3cdde900321903b444423fdc43e171de6b5c0
 EBUILD certbot-2.0.0.ebuild 1256 BLAKE2B 1e3714e2aece33cf51a646b27a2bed851673b170f50185efc52aa8105ac217c3a4f74b9c4f8eea0390a9ebd350428572a48301051df568be48d2c4b54e1c85f4 SHA512 2167665cb9046180b0e9ef7b21a944718d3836a8056cc4029b8c62de29827608bc66a6f1a623ca2e305d54a6293eeacbaecba5942506059087ee593d7db76f6c
 EBUILD certbot-2.1.0.ebuild 1256 BLAKE2B 2d6e893e10358f6adde06c6269d6c519ae2e72d4c2fb54deda89891ae339ddd8d8c3ebf962ef68bf7bd3a08e715cd4e077bb9c6c75e2e5d76eaa0d7f2503aada SHA512 bc7b1ac24fa5abe05bd9a103497bd1d93e93613029aba385391ff2c506557bdaffee79fd89e7cbb82f8781458b82448a8ce8f2e4d09e65f85415828775b94d94
diff --git a/app-crypt/certbot/certbot-1.31.0.ebuild b/app-crypt/certbot/certbot-1.31.0.ebuild
deleted file mode 100644
index c328f93f94d0..000000000000
--- a/app-crypt/certbot/certbot-1.31.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="selinux"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-certbot )"
-
-distutils_enable_tests pytest
diff --git a/app-crypt/pdfcrack/Manifest b/app-crypt/pdfcrack/Manifest
index 72db3995695e..68aec299a28e 100644
--- a/app-crypt/pdfcrack/Manifest
+++ b/app-crypt/pdfcrack/Manifest
@@ -1,6 +1,4 @@
 AUX pdfcrack-0.14-cflags.patch 236 BLAKE2B ce6e226f6bb8286437fa3a40abae4d1fbde59f7913f6d5fd0c3b510e8f92043f15e96ab790d777c4306a06291de9f8bab9633cf42b29ec0262f34558035b134e SHA512 8fd2f9bc024bff34bb1f7e90e7f27b80473ca12f340735f4cbb8d3717354df9907a9f05d57950a4a9f9604c2452a75cb7de341b4b84f2d248a63ca047131388b
-DIST pdfcrack-0.19.tar.gz 35383 BLAKE2B ddbbd813a8b76fd0b643ac5a9f63f8d82f76d2514e43dd0d4a4e4cc4feffb4b01598fc5438aef77f98b48c3df1f04139aa8db76d77eb3ed9d67a36a3b8ef57fb SHA512 e58819e7d90db9a66ebf9509c0b8aace7f8e7dbf5f8083edc70c3f2ca28cf16476bbdbaa77f7c563dcf824e440ca0df03e91d6aaf2a0435ec8f349f4e19ee626
 DIST pdfcrack-0.20.tar.gz 35647 BLAKE2B 31e0d1324254d660e5cb6cc57e401bf4fe7574630dcd902d73621a5e62c32e13f9cc6a9812c3ab904160727b27c08869f8f9f5b93657db5941a05fa10b49a4ce SHA512 50298aeec8a50b929d1440ea644bacb6afad638552948112b3fb2744124188e0cb52f67a804d76b09f747040aea56eadbab88e90481be8fce8e8147ed4c00188
-EBUILD pdfcrack-0.19.ebuild 517 BLAKE2B 12d10d2ba979a5637f408e9e0b2a55a934a1bd3885cc0d10e4ebc0828cc7f306092aec0ea3796f4e5c6835ad6ed11c803b2783d6be01d9e31e26b0f432dadb8c SHA512 00fc3f233d0be74c6b626c8d845357991d8904bbc8d391bd59beddbf7698192454730bc759290fa6d4f2f24f64071f3be7638cace4b7d3b0170a28e3bd9248bd
 EBUILD pdfcrack-0.20.ebuild 517 BLAKE2B 12d10d2ba979a5637f408e9e0b2a55a934a1bd3885cc0d10e4ebc0828cc7f306092aec0ea3796f4e5c6835ad6ed11c803b2783d6be01d9e31e26b0f432dadb8c SHA512 00fc3f233d0be74c6b626c8d845357991d8904bbc8d391bd59beddbf7698192454730bc759290fa6d4f2f24f64071f3be7638cace4b7d3b0170a28e3bd9248bd
 MISC metadata.xml 323 BLAKE2B 8bf6f35484582b427d43e9a028a027906d94b541f87948ab91c712cbb3ce7d8c912c2dc214919931ae2ca460b2b48ef2902cb4c7582e2d4017fa9eca57af4515 SHA512 35f9882efa018ba4342b5f04847ea6cbb2f573ecd4f0b2d2708346d4a1e3e2437ecb2ea5e63da689788ab9428267a694f2a4aaba40a6a81e09d685b7af1f95a6
diff --git a/app-crypt/pdfcrack/pdfcrack-0.19.ebuild b/app-crypt/pdfcrack/pdfcrack-0.19.ebuild
deleted file mode 100644
index 052aed0a732e..000000000000
--- a/app-crypt/pdfcrack/pdfcrack-0.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tool for recovering passwords and content from PDF-files"
-HOMEPAGE="http://pdfcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.14-cflags.patch"
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin pdfcrack
-	dodoc changelog README
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5a29ab4001f9..4cab22ecd1c6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2d31389de9e9..9b376cf49ef2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -18,10 +18,12 @@ DIST python-gentoo-patches-3.11.1.tar.xz 7076 BLAKE2B 3ec45f7529d34eabc9d9ba7fa7
 DIST python-gentoo-patches-3.12.0a3.tar.xz 6152 BLAKE2B 6c8c88100d184440cf27a4b9baf4f192310f62960b2061adca8dd423745836048f3f8489c434c51ab7572320356bc889498d68f3635f174194d6009e1b9277e4 SHA512 7b0dbcbefeafbdb2a822bb06950844ff21336ba1685a2af6bf2bd32b1ecde7c17591d01b2a018105b8c094149a9804d709c3ca17af67378644ad40fd5e02c012
 DIST python-gentoo-patches-3.8.16.tar.xz 28716 BLAKE2B 28ccad9d77a89f80f72dd12eb89d657825e80061eaa069d4c491736bffd87b235f483b9d079b9f383377ea4bc6c19471bb6a4869a37fc0401abe28e2444fd9d2 SHA512 fe94ee2851af5c87c64ea3af5c1a744a53dcb03743f824a7726803daf454f38511894e24fe68be9de4ab59d1798161a3c320748309d04afd1e77906df353a246
 DIST python-gentoo-patches-3.9.16.tar.xz 23348 BLAKE2B 26b66e57530d167776d2aee60fd4620fc8e6c229f371616fdaa74aa2f03fd5a50b61653a5f34e0f2659901ba167af7c2aadbb0d2db773ab08bac8b3125c84b77 SHA512 8260369d96a6328ad8498359ecc56f48cb02015547065cdaec28a6bb2293bef420cb12764fae9fdd13f4a6faa60c4c402e804a22cbed7dca031ac1679032f9f6
+EBUILD python-2.7.18_p16-r1.ebuild 8398 BLAKE2B 1dc34aecc6d89dcdac4f07609ee56ab50181b28db27624db71cc993feaa6abaa2caadb1ac176356238ea6981cc0807596c0bae377d523a2a88906df09d03c8f5 SHA512 de1c2fca948a9aebf10ac1524dfa50eb78981cf6d5a41ddf1c3d49d6ab2529ea99006cdd385a5220e9c9cb8ceb9aa7449e033203ee8892366dc9ae41f7084e24
 EBUILD python-2.7.18_p16.ebuild 8398 BLAKE2B f136256fc59c3d6808f964e647a50bf5107e9e9154ec3420de1ab8602421bc96541951ee607b4ef2c106982b2f7c280b9bb9eb86a324492c780bde5f26f0f60e SHA512 a36f0ae948b4cae1d86c3f8080cb41ba98b507ebb3a79142f79e1db25f5056b872862c2d76291a22e9eeba32cb6929aac54de5422d24b7e81f15c855012316d3
 EBUILD python-3.10.9.ebuild 13494 BLAKE2B e38c7e8c488dbd5abdc90cff0adca58c0f9d31574f1d96e26715d242991e230e0b629f2ae0f9aaa083cad56dcb06f5620afa1dd6966cdd38121dd9cc334ab7a7 SHA512 8f45cee05053fcec33621ddff100ba06e58361506166acd4d1633a019fd7eb72913275574ef941033529f33651878ca64d7ca300ea7efd0ce3a351c27798d5f2
 EBUILD python-3.11.1.ebuild 14393 BLAKE2B 04ad9dbac9e3854edf7de5ba6a6dfa18fbeaaac5a2a855e8b292e248fa88a3889f59cd0d91c3921c096af7a7512cb577f63457ccef37cfd2db0607dfb4d60111 SHA512 a29296f44c6166ac5a2591df9cb2b0d478f8c01efb5d77179f283d4ee2380f546ee48f5c98116b516c00df9eb1cb9537b97cc61d9624c8b8508d8d8789b0829f
 EBUILD python-3.12.0_alpha3-r1.ebuild 14289 BLAKE2B a7cbcfe9878728a4241a82e03a2bbc5b55f47d627aac35655b611f711bc51350d998beb5981c3e277667163e96789cd1dd25f42915bae36dcc02e3cc8da145d3 SHA512 07b6053f7ce6df58e5efa1d16faeddf9aefede2086340af8e83d2eeb0b26756f9e414c62a1c33ff91e7aa9dfb2c63d56b42ffc535889b12d30d1bcf6cadbb44f
+EBUILD python-3.8.16-r1.ebuild 12033 BLAKE2B 8d45523b483a773a0f1209c97e10e91218747f85438f79f9a673c3a97be24afbf302f86e23b6d0082a78117ac8a748699c310fa761e010f61e0fe8b09019bbcd SHA512 40aea8fbf30804938b74e6beae4240cb08936792401941f627b4801ddc5243d9ce0f998578c111d6967c50ff6daac7244d2865106907fadb609d90cd158852e1
 EBUILD python-3.8.16.ebuild 12033 BLAKE2B 54d2bad34a56fb283505bfe8a792683072f0b001a95b7be6b0721b20146ba8be8dd4882903435fbe3af11f4a6a415b2c83a506efa5ea2669e087790908874972 SHA512 dc5f945143389fb4b842f5bb500ae3520b92d72fb46a91645edbe8b1b73b9c26599b31ce4dae54a3e84cf3cc2d1b21151f68a547c576faccb5057c8fec14421d
 EBUILD python-3.9.16.ebuild 13292 BLAKE2B 7546c6d2f5fa89d97a92b7002ef40ca215ba0a50888e4f4ad53534ffd8c5029e69bf609b220062dd631c44253529b5e355711386d3ad401183f0094083aa476d SHA512 4c02b0acfed860b85acad5d00be7908e840d5866afd38a7112e88f2b5b790c736caa706ce7e998cc9c1b9417e9566c3a4525f562b3acf4f688e829cdb36669ce
 MISC metadata.xml 1436 BLAKE2B fd5ebcef153bc74aae02f8930dba67736ce44b1dd23418448e7d5bd22391845f5edf0ba8cdf3f43af9254c68734b95fbac9ee891f09c4584c9272ac4233eede6 SHA512 124a1e743cef7236f7936aa843d3aae739a420b1b6173f02c2ef787745616891142724446320d887aeecb95fac09e3620a9666e8e3e32085d79019fe71ff7da5
diff --git a/dev-lang/python/python-2.7.18_p16-r1.ebuild b/dev-lang/python/python-2.7.18_p16-r1.ebuild
new file mode 100644
index 000000000000..3e4ffcf39020
--- /dev/null
+++ b/dev-lang/python/python-2.7.18_p16-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils 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/
+	https://github.com/python/cpython/
+	https://gitweb.gentoo.org/fork/cpython.git/
+"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	berkdb bluetooth build examples gdbm hardened +ncurses +readline
+	+sqlite +ssl tk valgrind wininst +xml
+"
+RESTRICT="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:=
+	dev-libs/libffi:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:4.8
+	) )
+	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:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	fi
+}
+
+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 -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+	rm -r Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	if ! use wininst; then
+		rm Lib/distutils/command/wininst*.exe || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# dbm module can be linked against berkdb or gdbm.
+	# Defaults to gdbm when both are enabled, #204343.
+	local disable
+	use berkdb    || use gdbm || disable+=" dbm"
+	use berkdb    || disable+=" _bsddb"
+	# 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
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	local myeconfargs=(
+		# The check is broken on clang, and gives false positive:
+		# https://bugs.gentoo.org/596798
+		# (upstream dropped this flag in 3.2a4 anyway)
+		ac_cv_opt_olimit_ok=no
+		# 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
+
+		--with-fpectl
+		--enable-shared
+		--enable-ipv6
+		--with-threads
+		--enable-unicode=ucs4
+		--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
+
+		$(use_with valgrind)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x 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
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	emake
+
+	# 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=( distutils gdb )
+
+	for test in "${skipped_tests[@]}"; do
+		mv Lib/test/test_${test}.py "${T}"/ || die
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	# Daylight saving time problem
+	# https://bugs.python.org/issue22067
+	# https://bugs.gentoo.org/610628
+	local -x TZ=UTC
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+
+	for test in "${skipped_tests[@]}"; do
+		mv "${T}/test_${test}.py" Lib/test/ || die
+	done
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
+	mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
+	mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
+	rm "${ED}/usr/bin/smtpd.py" || die
+
+	if ! use berkdb; then
+		rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,lib-tk} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		dodoc -r Tools
+	fi
+
+	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"
+
+	# python2* is no longer wrapped, so just symlink it
+	local pymajor=${PYVER%.*}
+	dosym "python${PYVER}" "/usr/bin/python${pymajor}"
+	dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
+}
diff --git a/dev-lang/python/python-3.8.16-r1.ebuild b/dev-lang/python/python-3.8.16-r1.ebuild
new file mode 100644
index 000000000000..1e07c8aeabab
--- /dev/null
+++ b/dev-lang/python/python-3.8.16-r1.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2023 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
+inherit prefix 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/
+	https://github.com/python/cpython/
+"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk valgrind 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-lang/python-exec[python_targets_python3_8(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	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(+)] )
+	valgrind? ( dev-util/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+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 and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	if ! use wininst; then
+		rm Lib/distutils/command/wininst*.exe || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	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
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# 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.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	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
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with valgrind)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			--libdir="${cbuild_libdir:2}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	hprefixify setup.py
+	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
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	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
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# 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
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	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 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"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${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 694bb80e1e96..5faeac2b1b93 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 9ec6442b1953..b56f78ee1a80 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,3 +1,4 @@
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
+EBUILD confuse-3.3-r1.ebuild 1254 BLAKE2B b5669f9f15106b0b700e96d0cd6ef74fe0410c663d5f5b72f97dce9f7fbc37d7f4f530450a8a38e16977b0c3d950b608139eb1790b9fd73bb2e6123b282917c4 SHA512 727afd670e722f47097f0fdd1200e4ea83717ef5b22613e1f73f88b08fafd764274f2c8e32787cc4fbe9ab06d8a964fc3649cfdca8389fba409317f82d08e68f
 EBUILD confuse-3.3.ebuild 1162 BLAKE2B 867decdf55291a7acf6bf2cc5b557adcd5b2d18e50b116193aaa93532820e07212bf694dbcc4c42d42edbe00cc718b6f50cbd46f0153a4614c44b08828e6aa6c SHA512 6824fbbd39fef2b209d76e92dc4ab35947e4af35d82bef885e8717a4724d36ba634a7c3e7819aa78292f098f0c536a85773c2a4dd5bfc37b5c3fe78d65d1a8ca
 MISC metadata.xml 404 BLAKE2B 181eb97d12a1469dfc9c4adbb36990b2b3f54a3be487868f486c55b00c68fa7d9349ec008943abd8dcbb722c622af887ad1b461e314950b1325547ea99a16ef0 SHA512 482541679685e29a52f3d11164c678896d0c867beda2ed327698e1dd1418fac36be84f8bd53dec2b31e4c2725234cef403b01123dfd8d0557941308c03cd29f5
diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild
new file mode 100644
index 000000000000..b248bf5d34f6
--- /dev/null
+++ b/dev-libs/confuse/confuse-3.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal flag-o-matic
+
+DESCRIPTION="a configuration file parser library"
+HOMEPAGE="https://github.com/martinh/libconfuse"
+SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/2.1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="nls static-libs"
+
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# https://github.com/libconfuse/libconfuse/pull/167
+	append-lfs-flags
+
+	# examples are normally compiled but not installed. They
+	# fail during a mingw crosscompile.
+	local ECONF_SOURCE=${BUILD_DIR}
+	econf \
+		--enable-shared \
+		--disable-examples \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	doman doc/man/man3/*.3
+	dodoc -r doc/html
+
+	docinto examples
+	dodoc examples/*.{c,conf}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 7588a3d71fed..6af9c470c814 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,5 @@
-DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
 DIST ell-0.54.tar.xz 562496 BLAKE2B d5aa705d0a72068c18b4f7f2b40c80069fc4d8a746a4c8585140da5387e06a529019b4e8eb37d4caeb9fbb948100e86f78d678ca3a3c0964d03ec368f7a4be64 SHA512 dff507ced951a4919f6fe82b276446ee6a9bfb0b3b9fe7abb2c76a3c22cdccf92f97ebcb0a476946adef5b031fd0d86f5af934b052383bdd87b5a7962b021bac
 DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df034f0d85163daf0eb393b9bb75b1dd81c6e8a395e271bb0b8da01939df3497983aae5b6d270a70dcd5fc SHA512 f71b7d20a37009842ae54b72463e4c34509d00f0c344ae3b39acabe784fee83027d04b3f272f51dbc519f82ab794837b9a24ca90da55b97c757725d030c1874e
-EBUILD ell-0.53.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
 EBUILD ell-0.54.ebuild 1175 BLAKE2B 0725c7bec06368247ba9f365c8d6e6f9ea7649d0348d458158b0547c5fb1993789e2465bf2fc2c1c407a0c88488309e27210f3a59f7c7e0e15222fc96d0e8046 SHA512 4a7387f689ef514e39a78b7a323c4cc1096c183df9c1ee1d8ca04efea946f1ab21460faa6c4928d1a6166a8da00c86209b2416eb3adfc37b23a53b9e07aa0861
 EBUILD ell-0.55.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
 EBUILD ell-9999.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
diff --git a/dev-libs/ell/ell-0.53.ebuild b/dev-libs/ell/ell-0.53.ebuild
deleted file mode 100644
index 0220fd7c1acc..000000000000
--- a/dev-libs/ell/ell-0.53.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/kirigami-addons/Manifest b/dev-libs/kirigami-addons/Manifest
index 0bf8bd040dbb..a2eea4b955f0 100644
--- a/dev-libs/kirigami-addons/Manifest
+++ b/dev-libs/kirigami-addons/Manifest
@@ -1,3 +1,3 @@
-DIST kirigami-addons-0.6.1.tar.xz 83396 BLAKE2B b40ff06f709484715bb560a3fb146deff0b2be13157524ebfe1d22e6ec9e5bfd699f9b51d170f13b18f68c73cc02710a4189cd367d7f1766336e381956e1c59a SHA512 472730551d952b623ef329c7a9615d26f36b0b5f8b55f5aecb3d9b315799713431aad6e87e402862746cd1cbea745a9042b10696479f54a0ce3773787718226b
-EBUILD kirigami-addons-0.6.1.ebuild 1082 BLAKE2B 9b40567ed9ef101c79bad261d4e462419c79992818c29bede38ba2b95053ee68c724c3a2ee66c58dbc4220ee631250e6779961b2e0d1a8dac58e0fa33cceabc6 SHA512 94af4cd455b204e3a0133f1afbf3ce6e8f166941b137dc436b4078e1d8d9c3f726579dce7a024693ef058114e0d317484060d1275f3f68b2e6fcdfefbabd3dee
+DIST kirigami-addons-0.6.2.tar.xz 83620 BLAKE2B 36c8bd1c758d83aa45655f6323d65b7fed2394ddf066a4fc266d59e93d847cb1162a54f643fcee34235d58a9f919c532d87bed2901c075232100c486a54467bb SHA512 7e517a548c82e0a7a07da57950ce7f9bf3171e21b09cf041839af92e9602891e28d624cc55cf9660448a40669b6bbbdd05d050aa27e5f5547f1fdf4c9803ec2e
+EBUILD kirigami-addons-0.6.2.ebuild 1082 BLAKE2B 58420e935ed5061ed2721b7ea2d265af825639f3ac880bed5983bf7b1a37e3c74e68e86cb51fa9045d322dddc2932236f0ee9dac2cc9524c862da6d746c0e9fc SHA512 94bf385d76bcc7214b5a4fcfa8753e79e65cb5f05035b7c899657accc143469e86d99303c10cfcdd24becc567f52628f97fa4f88349df26ec36fa5dd03c28573
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild b/dev-libs/kirigami-addons/kirigami-addons-0.6.2.ebuild
index eb279c4a9b99..1ea72b702da9 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-0.6.1.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
index 9f6e18d8da14..00f9d5d43939 100644
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@@ -1,5 +1,3 @@
-DIST libcpuid-0.6.1.tar.gz 255938 BLAKE2B 80239930d7259b76289f6130c720d1700ae3a10be2a29b118cc8db38fb72f821b1d1a01afef06e00b2a3678b91b660ccd101eaf50af442a80166a508eb435294 SHA512 ccdb486a848f01a4f977c6f6b7ca59a2e65a7e04665e1a04bc3a57f1e8a68617f8bfbb2a71a1c93465bbaa7cc060fd7d120bbcb1a17fa004981e1074a4788818
 DIST libcpuid-0.6.2.tar.gz 265896 BLAKE2B 27f7c6c6a8bce6f27ca2f537c0255d8e8efa4ca5a7a278deecdb7b5c122830cc49e7e4524a2b2c0c39c0a43b3d05649c5e95a1bee843b6ddd981e3bee33383ab SHA512 36175387ae86e6f602544c516a875ac7fe0a3bde52e3e3c09f8852a804dd252694e17c638723aa3d36219d4588981cfd2261086bcf561d175e7c038e3a69e2ff
-EBUILD libcpuid-0.6.1.ebuild 753 BLAKE2B f2868a5e15edb572e13c2e6ce58aeb4d31966fbb73c1e5c6bc2f0730f936438f5019f696cf8e35fa01acca39cb06b0b074f6281251b7ed59a8e11e3c46119a31 SHA512 03beaa05a4d3c7f1b1f268b1c73a7e216040f3b04c8cc68d55212142db2408d39f2089d492047ccbfe1a9945db7849e7e752bff092dcae3deeda620a25ba27a7
 EBUILD libcpuid-0.6.2.ebuild 753 BLAKE2B f2868a5e15edb572e13c2e6ce58aeb4d31966fbb73c1e5c6bc2f0730f936438f5019f696cf8e35fa01acca39cb06b0b074f6281251b7ed59a8e11e3c46119a31 SHA512 03beaa05a4d3c7f1b1f268b1c73a7e216040f3b04c8cc68d55212142db2408d39f2089d492047ccbfe1a9945db7849e7e752bff092dcae3deeda620a25ba27a7
 MISC metadata.xml 2130 BLAKE2B 729a7382c0d844c94da0f24c0a96d6570fbb75202436298dafe21611c8047ddbf5d1479e5ab73655bfa28af5165bde93028ed662ae2c9c294474958bb6b5ef60 SHA512 62b2bdbeb95b3716b40532658720a63825e54c64f312151dd220070ac84d3a067658fbc69b1804afc00c861ebd4f0f0c389c007b1b70a06ffe1e4a7975bd5f3c
diff --git a/dev-libs/libcpuid/libcpuid-0.6.1.ebuild b/dev-libs/libcpuid/libcpuid-0.6.1.ebuild
deleted file mode 100644
index c3576366dccf..000000000000
--- a/dev-libs/libcpuid/libcpuid-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=(python3_{9..11})
-
-inherit autotools python-any-r1
-
-DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
-HOMEPAGE="http://libcpuid.sourceforge.net/"
-SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0/16"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf "$(use_enable static-libs static)"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index 6b06507300af..c8964f1bbf10 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,6 +1,4 @@
 AUX libtsm-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
-DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
 DIST libtsm-4.0.2.tar.gz 148135 BLAKE2B 4d81d5a19003ca1487e85bcea22604990e88770484a08a072105a2f193a0c7aa40832c9a81197c0fa26acc9c8d39d1ab796d4b92fa6af790f5ef803b8c68af05 SHA512 58eb955012fd154b7c165d799d0f80c9a71a504481e78471103fd299f2e73f3b7d89487387166895a9a5996165344335baa56f0550317caaa2eec6b0bad55e59
-EBUILD libtsm-4.0.1.ebuild 404 BLAKE2B e1704f91deb0ffe5e94b27c8c78e7e7dc7abb44f21f6857309e7e6f9b0815fdf19f7fda9371d24cbae5bb153614cd29d5b02775b0bf349ac052db0a9db103ab0 SHA512 b88d84bdf5b883c23fc9810aa6abb6f7154c6979010b194e109679612ee9b36d2e8a38524eafe2a8cf46688f0ef40ca31018e7af7313f27b9760f3f9f14d8093
 EBUILD libtsm-4.0.2.ebuild 404 BLAKE2B e1704f91deb0ffe5e94b27c8c78e7e7dc7abb44f21f6857309e7e6f9b0815fdf19f7fda9371d24cbae5bb153614cd29d5b02775b0bf349ac052db0a9db103ab0 SHA512 b88d84bdf5b883c23fc9810aa6abb6f7154c6979010b194e109679612ee9b36d2e8a38524eafe2a8cf46688f0ef40ca31018e7af7313f27b9760f3f9f14d8093
 MISC metadata.xml 314 BLAKE2B dc20ed24813bd8e2505c4dedf05346a3020120f7615f36077f6e44fb4dd9fa9c56552a8981d428795a74b986d73ff8fbb9071a74e906805930887328f1c28a21 SHA512 2da2ce098698f75d07c22696e2059e89d03072d52c5764d49aa8b948ee91850c51d4f8009ad4eae53abf1ee816b6ae0e76fa8d50725dcbfbb8c431b5d4f835a8
diff --git a/dev-libs/libtsm/libtsm-4.0.1.ebuild b/dev-libs/libtsm/libtsm-4.0.1.ebuild
deleted file mode 100644
index eb01dbb7c6d8..000000000000
--- a/dev-libs/libtsm/libtsm-4.0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Terminal Emulator State Machine"
-HOMEPAGE="https://github.com/Aetf/libtsm"
-SRC_URI="https://github.com/Aetf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 19e6ae3bb3ac..4fcec48e0198 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -4,10 +4,6 @@ AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe5140867bc3ac2a6f5d1718ee3b63fd7a5ae8870c008015eb88303452099a40e5488739572172bdc9b52b5f1dec2f05cc11de2fc32d1aeea7776143eb94 SHA512 0700ea717cbe380d0facea31f22c637e837fb050a115273c147629d945eb87780a3b10f05aa8b7ca52c31c80dc6f9f356b154041b7f5a80b51d438934d1c8ad8
 AUX newt-0.52.22-gold.patch 477 BLAKE2B 32145a4fc83d9ed91712ae5d90ef3409593bf911d078e81c9443081432f0f0ae73e9b1c1f7692d344db521d794f5ad2b4b1c0fe0c9d0f2e0cc8a16701efbdd31 SHA512 16ddc925c34dd128e5168e7a9be2653b5488635929c91229d1a12e71a2fe0be0755263ff68ca23e45b1296ec994cddecf1ed7fffe33453fe0971be82df60f19d
-DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
-DIST newt-0.52.22.tar.gz 128543 BLAKE2B 103ebe43ccd186068ffd468e56698e9f6f90ab5d687a14a27d454cfd68feb4ccd11710b6c472c07905a4aeb915efefd4f3b90c3c7822db7cdd5923c53996b7ae SHA512 2881340f97afccb8be02b2915a6f1de26de6c1e7c7b97776b8d2c87386e3f3611697a47b7e9b1a043f334d72b6d2bdcb7fd3ff128a7d994fcb437f456873016c
 DIST newt-0.52.23.tar.gz 128884 BLAKE2B 283809ac259475588b2f277e6c14ddc2981204f8d6c4963aa9ca7bf87376d2025e9edcc3194804bd6928f75deef706758e1868ba730fd06856ed0a95e534be00 SHA512 8040b01178311532c31642daae5bffc9c0f1917d28957164a02b3f5bd402e6561ff6faee75a936f72485eb71004238ede78c1973a970451fb5aaccff231887c7
-EBUILD newt-0.52.21_p20210816.ebuild 2362 BLAKE2B 599f18a5aaf23cc89bdb51034fd966115489defede1223f3c6f2d1be5cb3f42f8b794c74b46ce644cede0b58f214b78d9f6d9b90d2ec39a168a7f2597b0ee55a SHA512 7b21ba61faae7f4bf86582a9aedf505ac7230d531a579b4ff45ddcb9bbb0ae3b2dc2385694173c81dba4dcc386b92dba3e865dc636be4eb888e35b7dd9a9fa74
-EBUILD newt-0.52.22.ebuild 2232 BLAKE2B 0fe63461cb3a94c506021ad949c1b298019e459b04441ece92713921bb95dc143ea27a0511e6f2aa62533ac6d667d0c84d71dfd72a2d97bb10d440e8678ef079 SHA512 0dfe29a8917b86f04216571e10d08781598bccfec70a6631b2937ef26b3b5c605ea651782757582e452853f4a10773885b6d8746848ec1fd990f9da528caa4f3
-EBUILD newt-0.52.23.ebuild 2227 BLAKE2B b2fc228763851c064ebb3c65dfee20c169ab22cac66e5de49ff90f0a2334a628515da3c0fb9402a3528a9bba83fbd73cd23439eb420fc8a61b0b030c31a6d148 SHA512 78c2fdc732eac2c8ee828a0c666d47e8dffc44c81c481b61863cc7e4ed84795835cd59d3774cc6701a7b1a44367ac6ca996f7a6598c83c15442c4a9d503a6153
+EBUILD newt-0.52.23.ebuild 2226 BLAKE2B 0e99268ae465711b0e610c17a2bd896de4cf3a7c80cf8ca541a3614bfe307d505b69cad5fcb3592cb477d107a97b5caaa11c1e199338925cb0e06d5a1778c3d0 SHA512 adfa27274f37f80ce1c10a8d6023d4e4e3b84658df74f0ec049d948b140bbe369efa550e8f95239c4f9f90469972a4a1ea41fdf121ebc2c3c234ceb3db87d629
 MISC metadata.xml 333 BLAKE2B 5c5dc4580c21be4e57fd230e26cf7d9c79600b93f3f6788ba16b3f389c62a26c51a393a2d0147990492559c1b3fcc94751d7d8ac493f72e45efcedb152d2dd1f SHA512 34bb99d390ae88dbefde06ed990f5da92db8805fa7c2cd73ac86e651cbc14dbc6c8e00496ff1f38aee6c9c14ac654385bc41aa26020c63c49d39213dd5a0b9ca
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
deleted file mode 100644
index 57ed161c4cfd..000000000000
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools python-r1 toolchain-funcs
-
-COMMIT=a7533580cd092e6a71c4ed722e830da4eb884d06
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="gpm nls tcl"
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.52.13-gold.patch
-	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
-	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
-	"${FILESDIR}"/${P}-makefile-LDFLAGS-ordering.patch
-	"${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch
-)
-
-S=${WORKDIR}/${PN}-${COMMIT}
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lang langs
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	default
-	eautoreconf
-
-	# can't build out-of-source
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		econf \
-			PYTHONVERS="${PYTHON}" \
-			$(use_with gpm gpm-support) \
-			$(use_with tcl) \
-			$(use_enable nls)
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHON_SITEDIR="$(python_get_sitedir)" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-	einstalldocs
-
-	# don't want static archives
-	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
-}
diff --git a/dev-libs/newt/newt-0.52.22.ebuild b/dev-libs/newt/newt-0.52.22.ebuild
deleted file mode 100644
index b0f5287c0ec7..000000000000
--- a/dev-libs/newt/newt-0.52.22.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools python-r1 toolchain-funcs
-
-MY_PV="r$(ver_rs 1- -)"
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gpm nls tcl"
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.52.22-gold.patch
-	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
-	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	sed -i Makefile.in \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lang langs
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	default
-	eautoreconf
-
-	# can't build out-of-source
-	python_copy_sources
-}
-
-src_configure() {
-	configuring() {
-		econf \
-			PYTHONVERS="${PYTHON}" \
-			$(use_with gpm gpm-support) \
-			$(use_with tcl) \
-			$(use_enable nls)
-	}
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHON_SITEDIR="$(python_get_sitedir)" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-	einstalldocs
-
-	# don't want static archives
-	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
-}
diff --git a/dev-libs/newt/newt-0.52.23.ebuild b/dev-libs/newt/newt-0.52.23.ebuild
index 579d6a55f942..9dbe5c1f8be8 100644
--- a/dev-libs/newt/newt-0.52.23.ebuild
+++ b/dev-libs/newt/newt-0.52.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 985e2e56ebea..362e51fe3904 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
index 58a4f8abb015..b4fa774b2a7c 100644
--- a/dev-python/python-keyutils/Manifest
+++ b/dev-python/python-keyutils/Manifest
@@ -1,4 +1,3 @@
 DIST python-keyutils-0.6.gh.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
 EBUILD python-keyutils-0.6-r1.ebuild 791 BLAKE2B 275e69c63650d675d94edccc64ffa30b5faf7672fe2f3bbd7f04f2d58b83439c0421b576e234a94174763511618f77ba6688042d7e2f5edbb2e0944c3ed7dc40 SHA512 8fdc98b6851b3da46c261236f19e7bbf58a059f04cb9f6de33310441b52a986998dabc8cb417beef28148d734a5984ae5edc76d08115d6d4826b86697ae46486
-EBUILD python-keyutils-0.6.ebuild 713 BLAKE2B b478b7ecd924cbcc878d2a30fd452bba4f07591e1f294e164a08c450857df82987e419b6d1c509147f3a48bc8a59c51b84a1b1fa8b011c1d7da5f90058d010db SHA512 d935576540838a0c28168d3842e97d9ebac7246c56bf211f8472ad7ff99d2aa7a09854d1d16f9e4e5b45f5a488db4c0b2b160cbaf5fd7bd125f530bed9b985ff
 MISC metadata.xml 383 BLAKE2B c88a0df9232a36db1f568579905d43c26fbdf5e2bd119e6ae9e7e4ff54f85bf7e247d57edaa6f9a364a938ccd6401f7e617515381f3fb4f9ad1f739f93d016ae SHA512 769de9462b430f810c33781b059d24da4d006b1e47ce1e57ca529a8a240442120fbe8b03c38f4e189e045593192b23cb0f4c5e0e1e63b4e43051da64129f63e4
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
deleted file mode 100644
index c2ee4ccc7bfd..000000000000
--- a/dev-python/python-keyutils/python-keyutils-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="A set of python bindings for keyutils"
-HOMEPAGE="https://github.com/sassoftware/python-keyutils/"
-SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-DEPEND="sys-apps/keyutils"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	sed -i -e '/pytest-runner/d' setup.py || die
-}
-
-python_test() {
-	ln -s "${S}"/test "${BUILD_DIR}"/test || die
-	cd "${BUILD_DIR}" || die
-	distutils-r1_python_test
-}
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 02e05e877e9e..9a8459fc8455 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -2,8 +2,8 @@ AUX stapler-1.0.0_p20220330-PyPDF2-to-pypdf.patch 987 BLAKE2B 2bd426a54ef89c0ee9
 AUX stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch 317 BLAKE2B 7000903663d5843388203d4cb4984a93c93cd1524a877df0c1d8a474805b4b85701f903ab813b0afa9ef8b8bef3faae771822b6e28522e17cda014299b933d16 SHA512 c7f35ae69db4eb5d61d63a2a56e15315444696168a080dc81d2839f815d975c2da92cdf36f39e7bd8a38958889b1f588dce38c435fcec7fc5e7cd62e3b25befe
 AUX stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch 11876 BLAKE2B bcb22eece9e360e32bc6ef40ccdaac176fa6c2b265d962c52b399497f8347291f597a6a3b806fdf315937509d32b68bed79ccc580b2b4eb4789a5b7d4fbba2a6 SHA512 698cdbf12d36549c7e35c636b76e98bffe0f5b826bda8872f6a06a0cdb815bd855a63dc250a4f30aeb459d572db4fd54af81371664fd48cbf35aaf9b3f759061
 AUX stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch 1080 BLAKE2B 6342f8cc0931736aa6868749552da18d1c41656815f954826c6e9b2b1be0a18b45f8a8baac95d3e0f364c7c53ec7c6efb888a67b162134a9165f387e6d0c7824 SHA512 26b8d141dd765be117e9df42b78d79f68f1593e09420badb10793df007d031189627d2b3bab36635228a4337bb5b9c199472be41953be3973dd20bdddbffed11
-DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20220330-r1.ebuild 778 BLAKE2B 85f68550da515ac0c356dabb10758fab37efea3eff6b9c00689d560b60079b38f37a2ea32666a40696039dbbd51d5caf8d4b5266920a2b63c61ec0cdb55735fe SHA512 aad862b317e8179a6700af6eb3e838b2d9b5fcc06b6eaa11373d42329355524106ce262f14ebaf5ebfb1becc1d520acaefe53e8487ebaad2eb40fe4a248eb764
-EBUILD stapler-1.0.0_p20220330-r2.ebuild 860 BLAKE2B 1b9b1129e62c7783626bcff6cd657d2baf88d3bc90151edd00c645d4ef3f962ad7a3e2666d85936c9e5da4a3dfd2b004145405a5066363c8987d57c9c07f1adc SHA512 be7098951962c2af66f62dfc545693728d6e5afdd6ece998aaa2a163b1a32dd0ee70c5789f96f0f7624f54d92e064d776b78aa5ecd6766783d794e8b4ae8fadc
-EBUILD stapler-1.0.0_p20220330-r3.ebuild 884 BLAKE2B c9f80357c4977f0d1019b643a283197119e2cee67795dfbcb0089895794b91b4336379ae2c0b5e77a1b0e0d85c7109a13c7da0ff857dec76524dc88671f5016b SHA512 14d663f5c5225e17ec0c12964a02b446783d7c69df8075be989776ddc50ee1a260f97d7b2e286a5b155e9eb65e4087d912f02b0bd2e0fe64d62092684a9f4fbe
+DIST stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
+EBUILD stapler-1.0.0_p20220330-r1.ebuild 789 BLAKE2B 67d0481ed64f2028f1e94eed482dff68b43d1346d93dac81595e564258f5ee955f7f4e34e0f3d33aec9cee8835adc8472c7580cfc51f2fd7e18b06103b6f746e SHA512 1758c5026604ff8d27877ef98bf1bfc261b598a035f05e150e2fd1a36d3df21042ae92d842e7b6865d187f9ae5bcd1bb0523f729e8d6cf5beb5fd252418ef5a7
+EBUILD stapler-1.0.0_p20220330-r2.ebuild 871 BLAKE2B 9f9c86f3b5bd4ee5a09bae1f69c31822e6ea5ad0366fd021a6c8801764f2ef46b8a9fb5b1aa54c800aece35b27fff4a08fe9648310898ee0506a8c07ebeeab7f SHA512 66b70df1e85f172762069dd384ea22853617e9d89b782fe3b7761f52ec62c608cb5ddbe5af6fce54564f577b4c99380ebb76067e05dfd004df12ce1cd85ee6fc
+EBUILD stapler-1.0.0_p20220330-r3.ebuild 895 BLAKE2B ddf7c80e30d9fe3e1070f066ace02c0f784b5361e3186d9326bf656e2a1e40dc9e968f8f14cd41f5511f2f259b61a9d18cd49323c5c4854ffe9165ddf570f714 SHA512 dc8bb604693b9b480f2d4c3a9f7704c5f2cbf7515cf84120218937fcac3da795239bcbf0131352096de1109540d2e12339100389942ab738223b35fc4fbc96f5
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
index ba151de7317e..9ff1ae39edd3 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
 
 DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
 HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
index a86da6ed1319..3ea538b11f62 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
@@ -12,7 +12,7 @@ COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
 
 DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
 HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
index 34da11bb18da..7c84ad2402d5 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
@@ -12,7 +12,7 @@ COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
 
 DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
 HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index bd1705294192..d1563b697ef2 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 41b74826a921..235cd22bd569 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,14 +1,14 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 AUX qtdeclarative-5.15.7-a11y-track-item-enabled-state.patch 2084 BLAKE2B de9f0a8ed12b0ab50ff3d1aa54b30497a10967d3faa73014cfc4c388b2d0801b3bc09341c505719b09e8f2a4412b59536b400baf7b5db06ba84776daae095413 SHA512 c6c40614fc815cbd0e389e7acfb29ea8fae832ad580eb16b5f56d0d34d63491ce254e1a8adff03fe167b3c8063d98a26cfa90331908bff780bdc208ac7f4a419
 DIST qtdeclarative-5.15.7-gentoo-kde-1.tar.xz 24768 BLAKE2B 4595a64432e7c05eb51d9b565189d7f1d76e4d372db4247f1c21f8b4a655a0243c2487203ea669ac88143bb3f3d5dad969370d56522b046bc8fcc28d6597e124 SHA512 96859b52ccc453379c9137587176a26f99f2d4339bbf9008f8268585e77852339b32ffd86b57715109d573b5c6e2ad4963638ae946359d5b46e7a2e570ab2c64
-DIST qtdeclarative-5.15.8-gentoo-kde-2.tar.xz 20772 BLAKE2B ff77a5abd7e21cc80ba65cc236b7c7319f026b2b75df171c53043f766393b46da518c9dfe64a191b7445b6152bb91acb5ae628d8e354dfb701cf855d61960dbe SHA512 bea576f5b3366c21c2ef7f1225db9a355c9a6d8e643d5a084e02b2c6567ca4c93d910ba1f0c0a2620b4f6ac25ce4fd0d6276b14f8b77040b1d3a91a802294cd8
+DIST qtdeclarative-5.15.8-gentoo-kde-1.tar.xz 19932 BLAKE2B e889597ce322d642f0a1a60fd47b23a34b7d40585ab34841cfbce2225c24a4c56075698a3c9b9b93eb8dce80f2a42140269b84538a6c2817997221404892c180 SHA512 88c9483fca6eb10ecf4810dac369260b7d85372a1b698ea9587201398f65d442b6f8bd87603a277acc71f94e6f7cff2cca750888261a3b31c2734c09415d1fd3
 DIST qtdeclarative-everywhere-opensource-src-5.15.7.tar.xz 21591224 BLAKE2B bdb11b3929419a80a3ccd4bbcbc38c17069f1ddbfe5a8bb06345afda7d1cec66396b262b8e2783227912fca90c62b83b388922f631fb284b3b4476c43882276a SHA512 909721a7c756ad3f55fa30b539ddd7f459449edc599883a4e04acbe6f1cecaf44b3a5f2b3b17adb83adaf8cd3e1e5e7e09829b30b0df3dacb1e203892b996508
 DIST qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz 21592984 BLAKE2B 623264ffcca9f623896d73ce946cc0f621bdae50b520e454b59a1888a2c767f0ff089f69ed1c5e028d01fd28ae447add826fb09c615718af61e787fa1849b16e SHA512 c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73
 DIST qtdeclarative-everywhere-src-6.4.0.tar.xz 30538764 BLAKE2B 919081ba8a29a07daa01084388454a3d5f814e12ff5d1a4d3b647650e4bd6a839876baee1ab09e664e55e814338dbf675e70e4c44c28842a363c8f2dcf1a2b18 SHA512 6d43c09a14e2ca236fc50166ed477e37084e89a67a04d914f30f31662a18a4e6d0433cb9b2f0654ba9ffcbcd7abcb5dadcb7b12f0ef5928fc11b10925ee6f41e
 DIST qtdeclarative-everywhere-src-6.4.2.tar.xz 30564432 BLAKE2B b445672bfd91978855d11eac953c01902522ffe5c3bb48296f926be6234ee7dccfbb3386478633b81a44cbb067ef2078cf3c05a0b7358ae15e635c0d5ab9ccc6 SHA512 76742b8b0902802c1d7615c8b7948b245a535c5f9574893d0fc5f8e09cb914578c1243be23dee37f98bd037e9407f82bc71b22b688067aaa68efcec1db8f922a
 EBUILD qtdeclarative-5.15.7-r1.ebuild 1610 BLAKE2B 1ad01c1a9926d3bb7175ca71725197058c6def2efb88c2f189d0b7dfcc4182c06a239f28e425c786a97992d722f762fd1503e83a069e5a1ae82e8716a371a1ef SHA512 574f309790927ea4f8c54f0e815f8e4f7dcee5893ffd8a6ec3ae8d499563abb3a6947557cfef1a2dd176de285bdc047b2ff37e357050335cb27a4271b8e3da6d
 EBUILD qtdeclarative-5.15.7.ebuild 1537 BLAKE2B 76a9ebd883e91f0b2e9335fc54e1a60d57b727a1bdd28ea4bf98d4830e78faad55bb545783bd0d45e77dd3d286f1de6e366ad3c98c43bf1b296ae33ada741117 SHA512 18bec25fa9a214fc79bbf3ed5969ddc5fed1b51726ea966507d009c65c035421fe1d79e0a9a8e18802e9deb34919eb1b44110c8a137f4fba77d655a215d8cfd2
-EBUILD qtdeclarative-5.15.8-r1.ebuild 1543 BLAKE2B 4f4d321275787c9e01f85022e3687f2ecd6d96ab6dbd848aa7255d72b9644822bf669ff63d3c98f942e07d36cc6aab65e337a298f0ca5abb0a659843960424a6 SHA512 819e891879cb938d9f7753246a174524ba0dd721314d7c199f086db604f0f5a508a570bffcea0a4f07c75cf814320292279fe64b2f765cc217e919901b70315b
+EBUILD qtdeclarative-5.15.8-r2.ebuild 1543 BLAKE2B 99ca8d35bd069438a2d67791152766519ebb30f524658a559759202b5878848569257b3a878b1aac6aa607931792e5ee613223ed84f3794d063ee48743b4d96c SHA512 ea071705b5c59cc7ec82ec734bb4d428ad31ccfb0ab54fe9910eed859b78afc97d950a1d31b08f79e75f80108dab12daec77e2287d84ea9f4426f4b22d3399d5
 EBUILD qtdeclarative-6.4.0.ebuild 521 BLAKE2B 17d493bcf062e1d208438aaa85ad814af01546be1476569a9620f7d29270e94d3d8d253d38fb50781b45e83cd4a137262e860eac4a5452c8492f54f7dc8e5dd3 SHA512 bd7b10e8ac12a2deaf5751edb2a7e39ac2530aab69191dd3a1e0c7a35e6038e7f8a96ac7cc1f22fa8377cc1c2de14148f1ec9f767823832fbca59ea7c98d61d5
 EBUILD qtdeclarative-6.4.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 799 BLAKE2B d83b1968260ec3b1de9c62454382de42f214c985171c04f98377cd7e1c3a167b5a7707b328d0ffd700e525e7bfa82780907d7358df350a0a9922f36cac940d17 SHA512 b798e3e434f485c82fb058939e864a98dd86b5c2d5df902de256e461d37371291bf0159f31ff474be36d129effb0556e27eb5a5e95ab850fd987fa30f8caecf1
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.8-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.8-r2.ebuild
index 27750dcfd317..3c71973052f2 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.8-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.8-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=2
+	QT5_KDEPATCHSET_REV=1
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 061ed674ca1e..437abf62f02d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1efb1523c97b..7d7f44d7d3aa 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -4,5 +4,5 @@ AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0
 DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
 DIST facter-4.2.14.tar.gz 485039 BLAKE2B cc6862a3ed314af19ef38e5b1a000916cd8d7cd75f69c9ea38efda612ba82033127963c0230e0344e66cb90a9054d52a8882a8e49f90fc87b383b8dc69568656 SHA512 764af9e9e5957182d57e803b4519f6d831a12fdca4b9db77efa19c71edd1fc0af7f52b4953f54ba8881afe948db1fd93239e7de47be24a836587eace6420e038
 EBUILD facter-3.14.24.ebuild 2136 BLAKE2B 36bab1deadfda1f3ad2f25116e2f345f1c0e39bd25339063307d18f2b7ba285930f267bc44573de8bb6ed23db5919d743cd08d8576d13150d84d17aff0e3f524 SHA512 b73aa7de328d6526fadba4002130d53b4157b2f8030b4481cd971cdb4620fbd8931605ec85d02166c4a6d7723e9e224ffdf6afb563fe8334a4cf79a0e45b4f34
-EBUILD facter-4.2.14.ebuild 1300 BLAKE2B eadcd755ef5a280e96d4348ff73f5b56ffb5abaa5e079ab5d28f4abe96b0a1474bc54987233dc611d884cc31d81ef47cc98d542770408f953e9ad6361352a9b1 SHA512 2068cde0c95a80b7fecebaa4de2d6dc7ec8a822da74bca178c6247339cff1fb4a1ea2f77f357d84f4fa71a9047c94c70def1ff986c2db24939db8873724b3a4b
+EBUILD facter-4.2.14.ebuild 1298 BLAKE2B faa278e5811601fe8240e7b8476b1efd5f7ab99eb7f937998222bbcabdc90b1fdebadf93900bfd1885248704c81632948997447d32752caaff6825f536fea02c SHA512 31ab6d1d0aa92338b291ad55d2e6b9fa80d2c6bb624e537dffa191fd5f8791c19ea540f518d3dec0c954065d8645eeb971d8a3da61287d1d703d1a8b7a079b80
 MISC metadata.xml 620 BLAKE2B d7d91d8ed2cb868eb9af749462e7dcd4364dd44543614387f646cab41691525a8a03dd0e59210efeb6f39ddbd1428f2562bb9d77d29e3612ed5a1fede702a5ee SHA512 e51c01831a4052976bc481fdbeb33bf4b185ed926faf7b141526da3cde0d2c99d9b29b6a575f1fe2bf2d00719881a7bdedcb2093058b62ed3ea4c820b8b3af42
diff --git a/dev-ruby/facter/facter-4.2.14.ebuild b/dev-ruby/facter/facter-4.2.14.ebuild
index 27fd8ba4b603..1c4e136e7a9c 100644
--- a/dev-ruby/facter/facter-4.2.14.ebuild
+++ b/dev-ruby/facter/facter-4.2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f6a0444ccfd9..7b709f25f56d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index 45434cdefeb7..72ced029b411 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,5 +1,5 @@
 AUX breakpad-2022.06.04-gentoo.patch 3418 BLAKE2B cbcaabb31e17e45f7b2ed82a6bf6d0f0a587c205c4650d4ac813e8d44e7ac8b5cea7ea50836f40bd8175b96f8670522e09bc77826ab3af9bca45e98c32c529ff SHA512 424bbfd473acd5626abced365323282f95ccd95cd6bedaa30ffbb9d363ae42300dbe264e1d38d31ec8535b3730d42047a3a1b8f38ec845db1bb729be52375af1
 AUX breakpad-2022.06.04-test.patch 1949 BLAKE2B a5664ed800a6f51d980b82aced74c3bdcbd1608f19ebe2afc92ffa63bfc35ddb7fc0c2ba9b34112a46024553d0727123a0ee781e18c65170fc4792b77528f77a SHA512 9c83edad654678e098c702296bd6b0c308e516cab0a66a6b53ccffb9a8f7b7e6541cfc061cfa648d8538169d7297506a7da2369b6bcb1352f80eca0f09615e73
 DIST breakpad-2022.06.04.tar.gz 5365322 BLAKE2B eec33092a9a75161d16554af22276195945f3e1c7ce9590f89010a4d11484fe4327849c1717e159a9e019ca44d437b601b7080c68bba8c95111b97d6662dfc3f SHA512 150e5e955dc9de55d5cb4c726ae6f1a2e79e9f7bb283bae2ba835b684e7fd7532a7070e9ba982b66b68c936592bc48550a22ed8ac40e829b11aa80530f338749
-EBUILD breakpad-2022.06.04.ebuild 1086 BLAKE2B fb6a682152fbac44f5ca10c760e003461442fcb608064ebb9b00276272dc00d9a00719ee419cda33e1db4d2520591f2d524c14774153bee8031d010a6cc314ee SHA512 87de98b52d9c8e90cd50b0ee31e7f810a7ffd409e190a578c9ac6f000d43d2c478c05047abeb678f412867f748d87d869a761ed8ea1ea52db4886718d3afba0d
+EBUILD breakpad-2022.06.04.ebuild 1117 BLAKE2B af9f7e123bca8de3a9445728f7f7e31aaf6b990c1882b49949f36f4eaec8cc4565005bb08d062d844238f6b7f7c8c6547307dfda1c7e8fcfc7fabeb8862dfcf7 SHA512 257cd991ac3376ce5aa3cfd40ca3f38c35c714b0ba02c7cae62cf57247211d40367116a2376cc088fe046c4cd2af6c372950d2666be17ffc27484ebd9ead97b6
 MISC metadata.xml 328 BLAKE2B 1fb236117a2b1729f37d92c4cfd6a3ef2675e901467e0631a2be86d6f61c9e9103da96c730009aa3efb3e8846d2e9e77940ac925ea2700b87bee2ba7d148a2b8 SHA512 1f3b69819c461d2a3479490e963940db29211128b0f05faf60489f817fd69eabc79369e11d3f23299090e5bdb14399e72f54ee724e8f6b8a4b189859854cf951
diff --git a/dev-util/breakpad/breakpad-2022.06.04.ebuild b/dev-util/breakpad/breakpad-2022.06.04.ebuild
index d68490afa287..66912e949d83 100644
--- a/dev-util/breakpad/breakpad-2022.06.04.ebuild
+++ b/dev-util/breakpad/breakpad-2022.06.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,6 +46,7 @@ src_prepare() {
 		|| die
 	sed -i \
 		-e "/AC_INIT/s:0.1:${PVR}:" \
+		-e "/AS_VAR_APPEND/d" \
 		configure.ac \
 		|| die
 	eautoreconf
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 76fe78ca68d1..5ff7279166f0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 7730364d7791..09515d1e7151 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,10 +1,6 @@
 AUX fotoxx-22.18-documentation.patch 1074 BLAKE2B ecc735e158614bdbe2d44ec7463314a3f2f1151aaa95938a9415c7041ba0677acb4393d7f4d6c8817c0335e46dd365cc6f441102e0b6eb6f5ab233e70bf11ee1 SHA512 047ec5fa957ed3a9ad4e9667998045ec1c2d4cd6676f57275c40ea7d8797a0f95c7cfa2cd747e72f0f913c376bccdc708d73f675929302ce828c9d346d20885f
-DIST fotoxx-22.20.tar.gz 8687337 BLAKE2B 013a1f154ea9971c5ff5c33f3ab62bcec9a364f0d47a65648b251966a0b798e00dd80ced399bcfb3657cf2e95534d1e694dc2d2c36066502ddc3b50a645cdba0 SHA512 c9b6cb298546ab121be6ef2c907ce51e4a4060a52829ed1ef51475ae1e542c7cb39037402381969519907a2a66bd8f741452786ff3a25f30fbbd22b24032a436
 DIST fotoxx-22.35.tar.gz 8675173 BLAKE2B 0d0c709da603a59f432b184b0477cc3a65166c39209c5ccd440cbb317d1c835cf9b2a64870b10bff07debc4617585ed976f8a2157ee1a600861c2edab9ad023f SHA512 aceec8172da1c2c40c422ac194ab870a39cc33d6e1f484fc5fd7292145636ef546fa400023bbcc403d7e2ad108eef6d1c696cce7983c39088fede3a8538801c4
-DIST fotoxx-22.40.tar.gz 8704952 BLAKE2B 355cd57402d3008b3b39a20bdca0cf5bd597aacf7db3dc2c379ddcc20c80ff961c0dbdf8241dd3c2161fa8d3e59618a40907dc6f4037c83089d4c1ae369f2d34 SHA512 28f4761747a144c11eb8b1b10bfc174a3a29f95a95c35f800d33c21bc12c6fa3c8b69adf714419b9ecf188c2dc7408032af44f53e2385b38b333bcb67452f9ea
 DIST fotoxx-23.0.tar.gz 9258345 BLAKE2B 96510f43c2b8a289191a1194adf13b255d29ebd8aae4e286f2fcc180bb1ecefe5df7ab9251a55e83010a527d455117ddd99dea7df189a38bc82e5b233806307e SHA512 b40025f90561c10ebb107edf26863be154c0b699c811275f2de71f9da417921704fb2215266d725a7f84b19327da54b3f9be2d00db6dfb9738739a2e9ffc1903
-EBUILD fotoxx-22.20-r1.ebuild 2216 BLAKE2B e65f3bfecb82b5256a198ad9f2b5559738887d33d05ff159c7f9a5ec1977c2aa492c0e633dfa4b0427ae2a8ef7b18dc06e5ec7bdd0f40d2d694b758e50418a0a SHA512 6f6f97cfdae9709d8e0009b163e57c05b22dcf7c1c49aefa5c7c366d823d2db6fe78adc61df3a16b010d32052efbe5780b453f2279418b5f8b6327ee62ea347d
 EBUILD fotoxx-22.35-r1.ebuild 2216 BLAKE2B e65f3bfecb82b5256a198ad9f2b5559738887d33d05ff159c7f9a5ec1977c2aa492c0e633dfa4b0427ae2a8ef7b18dc06e5ec7bdd0f40d2d694b758e50418a0a SHA512 6f6f97cfdae9709d8e0009b163e57c05b22dcf7c1c49aefa5c7c366d823d2db6fe78adc61df3a16b010d32052efbe5780b453f2279418b5f8b6327ee62ea347d
-EBUILD fotoxx-22.40-r1.ebuild 2218 BLAKE2B 747b57f37d6ec0c34c7a29a0ff73b14e1121180e3b17d34180dad2469a0dc99e3ef4c83ae60f78805e616eece943f25cdad5e83b02e29a863a3367668e0d9bb6 SHA512 7dbaeb4ab99d0bbde681543859600ae72e8d4af34c7a976f7311e213d6df22f15b79be694662998bcd5407fceab39c6c91ad036204a2e557aceae1fd14689da2
 EBUILD fotoxx-23.0.ebuild 2218 BLAKE2B b376b01869bd4c9cc85bc0c2fea38d3d30b9fbf1cb75b9bedbc13264abc4b5057cc2b5e8767e926f6db516b308e2dc55548610b92381fbd0383693fa273951a1 SHA512 01b5fd2dd543530402e0072b7d2f8200316033756dc229bac315c605a02c2c0c11c447fff3dc75e309fe0b7cbf4ffc2cdd3710b1ea9653425b829c37d2b14ec5
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.20-r1.ebuild b/media-gfx/fotoxx/fotoxx-22.20-r1.ebuild
deleted file mode 100644
index 13462861777e..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.20-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-22.18-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 "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-gfx/fotoxx/fotoxx-22.40-r1.ebuild b/media-gfx/fotoxx/fotoxx-22.40-r1.ebuild
deleted file mode 100644
index 757e2c93d437..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.40-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 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/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libchamplain[gtk]
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-22.18-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 "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-video/Manifest.gz b/media-video/Manifest.gz
index e326295230d8..2ca948668c01 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index c07862a3522f..e2ce9adbc651 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,15 +1,15 @@
 DIST asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz 1211725 BLAKE2B 8ffe536e9398b23910deab9889136ac5cb2a39e26982826252400737ea68d201e11bf16f13f20bd4c777fc7ff718da5ef8d329747065c62e61306fc1448f3908 SHA512 91245741fe6e7ce8eec6897f222b05cfa9474f93487272d8ca84ec56679afd5cddff2cf07f30cdd6516149e0a138b8a7396b1a7c02a46044b38f4e60addcbf8a
-DIST cef_binary_4638_linux64.tar.bz2 104578246 BLAKE2B 13ee05d4a2fbf27290506297416b298c786954450c19183b493d13aa691db409c22b30870fbc55adf814ff30142a666eb8b172f16ccc48e6cf01135c72e5d6d6 SHA512 2eb01151e07adf332affce36a659c6e87da1fbc403c65db7e7c53472ff418df6cd04300a7c6ebc8789c094926429cc70d829e556e5de3127da230f8258fabe49
 DIST cef_binary_5060_linux64.tar.bz2 132839531 BLAKE2B f7d342cf12bf435aab3873b666a47c42c6583a88f140c28dabfd2dd860cd0d5c96cc51cc034703bffc6f1094a738bd77008c01839fa5ea53b848bc1c483a0ae4 SHA512 c99ce53858c57becd7822e39ff81d59b7296374fa61b29dfd4a572c2ed8f9ab155114ed179764ea05586e0edb2f1654f0b73c471f1cd9b233660e7f1c8b462c4
 DIST json-a34e011e24beece3b69397a03fdc650546f052c3.tar.gz 6860722 BLAKE2B 433b499f24859153171654f3fd0fa9afd4ceb8b21a159185a424084b940d8496f8952c0291a52d85009dde16c46e45d5a206f354d043f4d010a29a1f18965d87 SHA512 a7c64517377274479bc3060163a2a7ed0a8780c12dc193287c060f04dfd742ffe8832c930bec75eb0b36f8290044c31530260a614aabae90367f6ccfd4b711f3
-DIST obs-browser-915761778ec1eae99e740ad4bf63b40db3142ee2.tar.gz 100021 BLAKE2B d72df588aaeaf199c6ea5a7e419bb4792ef8b4c4237e700f75064d96caaec83ed2be2ea4ab34ba31e30a87ec6cbf1f267dd7b100c3a6cfec36e46b2eca8c4b2e SHA512 3ab6118a9509054ea4e8aed14dade7f374495ba25fcb5295a3ef7ed29e6e3305b0ae2f12ba2c0d27fcd6886822c98ab44a48fa9a4b66ae0507ab2bf1001157cb
 DIST obs-browser-e2310b02df3e6c184fe6eb6608244a82e37f582e.tar.gz 109012 BLAKE2B a2f3d9e1a3dbc3aa4d00423e743633038d59ce501626941a21ef0cf78608f4190335b8b846bfef49b2f09976d4ef3bb8b19f955b2a328c375cc045b886cb367c SHA512 76494fc9415db68d2b67d832a7a5c8b035e4e379d9adb6eb8292579d12b88b92350692b24e999b1328e02f729fae4060304594d37c754ff359903193c1464aed
-DIST obs-studio-27.2.4.tar.gz 16385399 BLAKE2B 00c05ecd055d707b7132ca4b20e1c4946b682c0f79f1477167ae55aba3ec367c97b05aac190b07260f936e68f79f2d58e19dcc0602f70408f4c056eb733a6fdd SHA512 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf
+DIST obs-browser-fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz 109571 BLAKE2B 10082c64bd872d52fccf7bd539f7106c5b66fc9d6e5f31ffdb86c2e6a3e97b36a4848f5f6f008cbfb67f94bd1fad01c7683e8575e3e0f8d1808724e740be4e11 SHA512 113f97a21be8deb8bbd1ec98fd565ebb139d4b6901692ed5f61034581da7016b06fa6975b49db3fd2c7aaeac369a09ac98174798abba149aacbfffd2e0b40236
 DIST obs-studio-28.1.2.tar.gz 18859931 BLAKE2B 08fcedb4094d6a03512139e9055116f47fbd6cf706029d2719524bc018d0dce2a774de83b603f9a7665a115e2414775b858020e0be0ccdcc6882478256392646 SHA512 9d5e7e1f2f6236b795c2c49a1a6ba43623c71f16c1c6106fae6ac99b792e15793c169fb62aea271c253b13a0fd9bc9b9ad7880315d9ee787682174a5700f85bd
+DIST obs-studio-29.0.0.tar.gz 18894364 BLAKE2B 3cf120b5bc9bae3d797a55aa0d348a6eabb2c0ccbf71d89e203468c42780212a6ad0ab52eaa913a8942a4b9c1bf07a50dc951891bcf2cbc3639177f983841066 SHA512 14208682fd7c2d5bdc049affe9adcdda73f5d9177277da021aed942518f23c2f3bec8ed55ba58fd8ee3f5f575b13f1083b36248a1073bafed2c4bbb2bd28ec61
+DIST obs-websocket-31f9845b6132e6c1529401292bc1125401e2a324.tar.gz 238884 BLAKE2B 93a41ff9dd33cf2babaef90c961def1ae39d3b4e7d2f2542123973672c2adbd0cff987f58ce72e9c4acd8818c834531e624c376b3d297f4bdfc097e22ee4b293 SHA512 11bf28f574ec2a7b128dae53010484610465c94245881fd98eb750b59e00236f656d1ef706187a41cb42eab3e3668440d83f66399f6917e2d93b7ba6c7241ad3
 DIST obs-websocket-5716577019b1ccda01a12db2cba35a023082b7ad.tar.gz 235118 BLAKE2B 96202cf81389b82b26027680dcaa6e2bf902c9776a89895fbef859dae2986523bc5d34ad30233c29fac043611a942fb4d86e5d9d9cd4ef2a9503154a383002fe SHA512 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c
 DIST qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz 135863 BLAKE2B fa6fb9c9e5250b56bdf38f31aa4acaf4ce860c153012984d1266928bd7a62dcf43b271ff53b4322931304670742566dcb016ef65ff2f681bf76224f86eca567c SHA512 ba298de89411fecc8db3dc10850485da01f5183d68b6d91ea91a9e28c1f104eb110adbf143a37e5d1856abbba5d309ab8329a6359ca7225bacb033d8044fa72c
 DIST websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz 701544 BLAKE2B 61680c31309d8f78b27b82e1bde2c7828eae2777df0629355c557dfd8b0daef6de7d202bbcff372351e135bb62366ffc8eec6c72a99df7c46a9197773c46550c SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163
-EBUILD obs-studio-27.2.4-r1.ebuild 4936 BLAKE2B cf1ef9f5cb3e04dee47192f41dff88bbcfe7438274e917b358149aebd6013b28b41bc74e114a070ec8976de87cfbd32890ec4c1b07375a0e105777826e6aa906 SHA512 40f952b75b86621be22d32351dac0fe1f08562e78a6b57e06ef1895fce9f85635824822718637a338860c9a80ed65ec208f06034a80dda845bdb5187bcbc496e
 EBUILD obs-studio-28.1.2-r1.ebuild 7193 BLAKE2B 530dfacbe0f21b9bf08a73506488a1e8b5ed593dba0962437e09b8d7168bb7998b17f9987526fe4885c31410735ad3857d8d027082a94861ededf90a8b7d09ae SHA512 41cdf2d02fceb62ebf208e267d689b24b8f4a7cd95c2af514898ee5a9c682041aa329ae8a0f3849dfe02abaeb2cf2cb114647a94db705ab0538a57ee78bf5caa
-EBUILD obs-studio-9999.ebuild 7162 BLAKE2B 35c6d7ed67a515409f18bd2960fb20ba6e2abb78f30c4ba736ef581db58faf84247091a3bb95a728386a09c33abe3dc4777a7535d9de9c9a9ada322d7b930288 SHA512 22ff7a898621732a85722bb223029861e00b336bd32feeb4ae43ca2a5f9d72c22ac347be0678adfe53ab966f5a9c1be8151b0dee45cd012559c4d60df76f617d
+EBUILD obs-studio-29.0.0.ebuild 7193 BLAKE2B 6793f68d25626db9a90f39f013d60e709a85d1d292f84420487f63904ed6f97f413de5ee7b9dfd9897da0cccb1d7f09c96e8798d6a15317eac73a7172b1b71d0 SHA512 b91eec789a9020410f38e988fbf68d272d1fba4dbedc4084b9001d0271486dd7e0fcdb4d5bea883644c90a510d5197a4bacad2fc35d594c0b861602f0a653850
+EBUILD obs-studio-9999.ebuild 7193 BLAKE2B 5268afa5b83a1ae6857fd74c5a176b5fedb2d84fb459191e63dcf37678aa522d5e8d9d9a2abf1ae12a9351b24a36ce2492d44b1d1ae4b3a98ea4e86991de5d12 SHA512 3849f7744f4f434e2e99a97bf4e37cf19a699282ccf005169a2cf38a23ed570d3d3fba67e46380a2ca0356d4a4c7a35ac31a536353af03ca3294479480583419
 MISC metadata.xml 1330 BLAKE2B 4df42f330b8a71cce033c42750434f1fdf9147bff19ee612c14be9187a9fd770b1e998d8f631c4e4da9eef7ffcb863f3a398883612cb2f7d49046529ad5e1f09 SHA512 dafece41c313bb983958c380e422f513af6d2716df90e87e74b85c604ce3ce896735fc618e5028289ff37b71d929ae623828de620e8b30fb2f8de84190a47dfd
diff --git a/media-video/obs-studio/obs-studio-27.2.4-r1.ebuild b/media-video/obs-studio/obs-studio-27.2.4-r1.ebuild
deleted file mode 100644
index cb4455e6dcd5..000000000000
--- a/media-video/obs-studio/obs-studio-27.2.4-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake lua-single python-single-r1 xdg
-
-OBS_BROWSER_COMMIT="915761778ec1eae99e740ad4bf63b40db3142ee2"
-CEF_DIR="cef_binary_4638_linux64"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=( plugins/obs-browser )
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+alsa browser decklink fdk jack lua nvenc pipewire
-	pulseaudio python speex +ssl truetype v4l vlc wayland
-"
-REQUIRED_USE="
-	browser? ( || ( alsa pulseaudio ) )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/jansson:=
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[wayland?]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/libglvnd
-	media-libs/x264:=
-	media-video/ffmpeg:=[nvenc?,x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib:=
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb:=
-	alsa? ( media-libs/alsa-lib )
-	browser? (
-		|| (
-			>=app-accessibility/at-spi2-core-2.46.0:2
-			( app-accessibility/at-spi2-atk dev-libs/atk )
-		)
-		dev-libs/expat
-		dev-libs/glib
-		dev-libs/nspr
-		dev-libs/nss
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/mesa[gbm(+)]
-		net-print/cups
-		x11-libs/cairo
-		x11-libs/libdrm
-		x11-libs/libXScrnSaver
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-	fdk? ( media-libs/fdk-aac:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc:= )
-	wayland? ( dev-libs/wayland )
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	usr/lib*/obs-plugins/chrome-sandbox
-	usr/lib*/obs-plugins/libcef.so
-	usr/lib*/obs-plugins/libEGL.so
-	usr/lib*/obs-plugins/libGLESv2.so
-	usr/lib*/obs-plugins/libvk_swiftshader.so
-	usr/lib*/obs-plugins/libvulkan.so.1
-	usr/lib*/obs-plugins/swiftshader/libEGL.so
-	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	elif use browser; then
-		rm -d ${P}/plugins/obs-browser || die
-		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
-	fi
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
-		-DBUILD_BROWSER=$(usex browser)
-		-DBUILD_VST=no
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_DECKLINK=$(usex !decklink)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-
-		# deprecated and currently cause issues
-		# https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
-		-DLIBOBS_PREFER_IMAGEMAGICK=no
-	)
-
-	if [[ ${PV} != 9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !lua)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-}
diff --git a/media-video/obs-studio/obs-studio-29.0.0.ebuild b/media-video/obs-studio/obs-studio-29.0.0.ebuild
new file mode 100644
index 000000000000..2772d0c7ac53
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-29.0.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake lua-single optfeature python-single-r1 xdg
+
+CEF_DIR="cef_binary_5060_linux64"
+ASIO_COMMIT="b73dc1d2c0ecb9452a87c26544d7f71e24342df6"
+JSON_COMMIT="a34e011e24beece3b69397a03fdc650546f052c3"
+OBS_BROWSER_COMMIT="fc62563ba4232649b7e0ffd772e66ad71ba49377"
+OBS_WEBSOCKET_COMMIT="31f9845b6132e6c1529401292bc1125401e2a324"
+QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
+WEBSOCKETPP_COMMIT="56123c87598f8b1dd471be83ca841ceae07f95ba"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
+	EGIT_SUBMODULES=(
+		plugins/obs-browser
+		plugins/obs-websocket
+		plugins/obs-websocket/deps/asio
+		plugins/obs-websocket/deps/json
+		plugins/obs-websocket/deps/qr
+		plugins/obs-websocket/deps/websocketpp
+	)
+else
+	SRC_URI="
+		https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
+		https://github.com/chriskohlhoff/asio/archive/${ASIO_COMMIT}.tar.gz -> asio-${ASIO_COMMIT}.tar.gz
+		https://github.com/nayuki/QR-Code-generator/archive/${QR_COMMIT}.tar.gz -> qr-${QR_COMMIT}.tar.gz
+		https://github.com/nlohmann/json/archive/${JSON_COMMIT}.tar.gz -> json-${JSON_COMMIT}.tar.gz
+		https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
+		https://github.com/zaphoyd/websocketpp/archive/${WEBSOCKETPP_COMMIT}.tar.gz -> websocketpp-${WEBSOCKETPP_COMMIT}.tar.gz
+	"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )"
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
+SLOT="0"
+IUSE="
+	+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio
+	python qt6 speex +ssl truetype v4l vlc wayland websocket
+"
+REQUIRED_USE="
+	browser? ( || ( alsa pulseaudio ) )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	media-libs/libglvnd
+	media-libs/x264:=
+	media-video/ffmpeg:=[nvenc?,x264]
+	net-misc/curl
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libxcb:=
+	alsa? ( media-libs/alsa-lib )
+	browser? (
+		|| (
+			>=app-accessibility/at-spi2-core-2.46.0:2
+			( app-accessibility/at-spi2-atk dev-libs/atk )
+		)
+		dev-libs/expat
+		dev-libs/glib
+		dev-libs/nspr
+		dev-libs/nss
+		dev-libs/wayland
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		media-libs/mesa[gbm(+)]
+		net-print/cups
+		x11-libs/cairo
+		x11-libs/libdrm
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libxkbcommon
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac:= )
+	jack? ( virtual/jack )
+	lua? ( ${LUA_DEPS} )
+	pipewire? ( media-video/pipewire:= )
+	pulseaudio? ( media-libs/libpulse )
+	python? ( ${PYTHON_DEPS} )
+	qt6? (
+		dev-qt/qtbase:6[network,widgets,xml(+)]
+		dev-qt/qtsvg:6
+		x11-libs/libxkbcommon
+	)
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[wayland?]
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls:= )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? (
+		media-libs/libv4l
+		virtual/udev
+	)
+	vlc? ( media-video/vlc:= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+	usr/lib*/obs-plugins/chrome-sandbox
+	usr/lib*/obs-plugins/libcef.so
+	usr/lib*/obs-plugins/libEGL.so
+	usr/lib*/obs-plugins/libGLESv2.so
+	usr/lib*/obs-plugins/libvk_swiftshader.so
+	usr/lib*/obs-plugins/libvulkan.so.1
+	usr/lib*/obs-plugins/swiftshader/libEGL.so
+	usr/lib*/obs-plugins/swiftshader/libGLESv2.so
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		rm -d ${P}/plugins/obs-browser || die
+		mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die
+
+		rm -d ${P}/plugins/obs-websocket || die
+		mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die
+
+		rm -d ${P}/plugins/obs-websocket/deps/asio || die
+		mv asio-${ASIO_COMMIT} ${P}/plugins/obs-websocket/deps/asio || die
+
+		rm -d ${P}/plugins/obs-websocket/deps/json || die
+		mv json-${JSON_COMMIT} ${P}/plugins/obs-websocket/deps/json || die
+
+		rm -d ${P}/plugins/obs-websocket/deps/qr || die
+		mv QR-Code-generator-${QR_COMMIT} ${P}/plugins/obs-websocket/deps/qr || die
+
+		rm -d ${P}/plugins/obs-websocket/deps/websocketpp || die
+		mv websocketpp-${WEBSOCKETPP_COMMIT} ${P}/plugins/obs-websocket/deps/websocketpp || die
+	fi
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AJA=OFF
+		-DENABLE_BROWSER=$(usex browser)
+		-DENABLE_DECKLINK=$(usex decklink)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_JACK=$(usex jack)
+		-DENABLE_LIBFDK=$(usex fdk)
+		-DENABLE_NEW_MPEGTS_OUTPUT=OFF # Requires librist and libsrt.
+		-DENABLE_PIPEWIRE=$(usex pipewire)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
+		-DENABLE_SPEEXDSP=$(usex speex)
+		-DENABLE_V4L2=$(usex v4l)
+		-DENABLE_VLC=$(usex vlc)
+		-DENABLE_VST=ON
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_WEBSOCKET=$(usex websocket)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DQT_VERSION=$(usex qt6 6 5)
+		-DUNIX_STRUCTURE=1
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		mycmakeargs+=(
+			-DOBS_VERSION_OVERRIDE=${PV}
+		)
+	fi
+
+	if use lua || use python; then
+		mycmakeargs+=(
+			-DENABLE_SCRIPTING_LUA=$(usex lua)
+			-DENABLE_SCRIPTING_PYTHON=$(usex python)
+			-DENABLE_SCRIPTING=ON
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
+	fi
+
+	if use browser && use ssl; then
+		mycmakeargs+=( -DENABLE_WHATSNEW=ON )
+	else
+		mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# external plugins may need some things not installed by default, install them here
+	insinto /usr/include/obs/UI/obs-frontend-api
+	doins UI/obs-frontend-api/obs-frontend-api.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if use v4l && has_version media-video/v4l2loopback; then
+		elog
+		elog "Depending on system configuration, the v4l2loopback kernel module"
+		elog "may need to be loaded manually, and needs to be re-built after"
+		elog "kernel changes."
+		elog
+	fi
+
+	optfeature "virtual camera support" media-video/v4l2loopback
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index dec59165b47e..7f59a44f183c 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,8 +12,8 @@ inherit cmake lua-single optfeature python-single-r1 xdg
 CEF_DIR="cef_binary_5060_linux64"
 ASIO_COMMIT="b73dc1d2c0ecb9452a87c26544d7f71e24342df6"
 JSON_COMMIT="a34e011e24beece3b69397a03fdc650546f052c3"
-OBS_BROWSER_COMMIT="e2310b02df3e6c184fe6eb6608244a82e37f582e"
-OBS_WEBSOCKET_COMMIT="5716577019b1ccda01a12db2cba35a023082b7ad"
+OBS_BROWSER_COMMIT="1c2264d722f065646b72ac654f6ddbb6843f9bef"
+OBS_WEBSOCKET_COMMIT="31f9845b6132e6c1529401292bc1125401e2a324"
 QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 WEBSOCKETPP_COMMIT="56123c87598f8b1dd471be83ca841ceae07f95ba"
 
@@ -198,7 +198,7 @@ src_configure() {
 		-DENABLE_NEW_MPEGTS_OUTPUT=OFF # Requires librist and libsrt.
 		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_RTMPS=$(usex ssl)
+		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
 		-DENABLE_SPEEXDSP=$(usex speex)
 		-DENABLE_V4L2=$(usex v4l)
 		-DENABLE_VLC=$(usex vlc)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9b3b602283a3..e1b2012b454d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9f660862d606..f0ba6b7583da 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Jan 2023 17:44:20 +0000
+Tue, 10 Jan 2023 22:39:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 612238cbcfc9..a990cf2fcdcd 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2023-01-10T17:44:23Z
+TIMESTAMP 2023-01-10T22:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO9o/dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO96S1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC8wRAAlM6BYRQy2yp2J9jLyB4aWR9d4Vm3ffFi/r3yH4sr9qRh1Hgkj9XuVHGT
-KW0OWK+9sJmVy1ijOBSY06VhtXDUVLbFpSwU8JRrkjBbIB7g/fFZa2wpyOJ7SleR
-wKnaL+YzLB6YFoRj0n6XR7GdNdaZnzN6oZZ8++aB3lffvoNbURwOaeEBAsVu8ZhA
-8RDjLFde+0PtqDlXnRRNPh2UKrjYI2PcizYpb6vIS1gtVrwlsKOpGU6LZdCY5VXd
-4hEn1ykfoWb75vGc0AIoqT7e003QkCpd/d7Qn2gsthV8hIUF+hYII+PNyb6q3u3L
-ize9MsW2btDT6VOLniAcpVBeB2kg3jXyaePeuL5CtPAkOfjBd58to+QMUOQsAfWJ
-skbkTtycIPcviKmlnAHPfoe1jMqQClHfNEfBk1LhKqRmCnl5UUuWCWC+TxOYkiz4
-Ynxc0qfcGyVpLTeYmBY8u37Lo2zZPz/2BJoMSr1g7KzkMXiLeyeczLPM6tJzyAlt
-Zy6pqzhO1O4YLNf0I50Yg+qmNNEN6pvPJNqXyhzCXDvIJTmFpjsM43ulfkfSlvXi
-NahCVH7Ksw1KLGlWrtxrX0kkbnKPR/CNTU1rGl8Q5IroHc1H94WmaLkx3Nu8Cx6j
-lV5MtaDhRNw8TSYA8PHLVK/+kzzWZ9haJx12Awiz1PJWRdE4xaE=
-=hNsJ
+klBr9w//cOK5dL7QBzAE2obMrPnjbCgsGI5iujH/13K24tEZoUsPPs630Ci5FDI/
+Jevr6eUN/R0tjsDU0vXGh9AZA7kEJxt5tnqMvx7lSrJYS8N1i1B0hzm5Atp1QmRS
+xf4aGbzgYW1Tq2LyFTUg1QSRz5jTH/P8pYXr9g0I27ljYXuD3eZMXMyQxQ6ZujJc
+eRCCl2GG6Rs9pgKLisTxZJUDtG2KDQ/Zi5dgtu+89asxBJDi3awRnhyco2iVR4cV
+GFkvl6BB0kikuUF78re5jbjFQbzC9vZknjKFT1MICHfIFctIuSZhYQ3qGLLqs+Hd
+0PT1s6O7f+NZzWwqQe2ukBND4q8U04ZYsL5XRSiR4OABJtXbXND9AwIOcYVUIcEw
+KgilLcNyi9PK4joSLkNcBjhDfbBFCwz0OzcMxdoi2Oja4RkGNt3+fOP26w9RPEKi
+YPoDn/ZKtjrlXxDjAEbo9UJJgnitov6czi4BwRfJxUh9USj0wNuE0Pn6VDOtH0z8
+49UFPJULOSTOwOHgztcwb8lmbM4+It5m1NLB7Sq9yftmTIeH/myBGxHEXtfGLZkW
+oQ0ADyZjFr+nz3C93fyylLU54mp7EQ3jMJAwQLTghp2ogLijKv1BZ12fQqOB+caT
+19bz6bvpql4oawRNYAPAY22g1YzYsOGiYUpg1tf1OgutUIZTKEg=
+=8ZSC
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index eef90edc1175..f0ba6b7583da 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Jan 2023 17:44:21 +0000
+Tue, 10 Jan 2023 22:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c6b8f59ed073..63f0c424ec03 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 5dda4bd8f8af..0fc6c69a83d8 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/puppet-7.21.0 b/metadata/md5-cache/app-admin/puppet-7.21.0
deleted file mode 100644
index bfcc1f268435..000000000000
--- a/metadata/md5-cache/app-admin/puppet-7.21.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=test? ( 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_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_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A system automation and configuration management software
-EAPI=7
-HOMEPAGE=https://puppet.com/
-INHERIT=ruby-fakegem systemd tmpfiles
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=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_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_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0b88ce34a84ffd2d80a0d58d56f4f818
diff --git a/metadata/md5-cache/app-admin/puppet-7.21.0-r1 b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
index 4241cd444ec4..e93e2cf665b1 100644
--- a/metadata/md5-cache/app-admin/puppet-7.21.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://puppet.com/
 INHERIT=ruby-fakegem systemd tmpfiles
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=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_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_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.21.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0b93771536303d885e452461d588b4da
+_md5_=2958414fc0f147ac35061be072ede401
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.21.0 b/metadata/md5-cache/app-admin/puppet-agent-7.21.0
index 01ca85f87c31..a13f7ae9b042 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.21.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.21.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 INHERIT=systemd unpacker tmpfiles
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 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=amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.21.0-1focal_amd64.deb ) arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.21.0-1focal_arm64.deb )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=4f472ea258b7c4bbcc3d6d527f89cfc1
+_md5_=53f5169f0576fa74daeeed1869ab8dd2
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.9.3 b/metadata/md5-cache/app-admin/puppetserver-7.9.3
index 805cd0a52b78..0bf4373770f2 100644
--- a/metadata/md5-cache/app-admin/puppetserver-7.9.3
+++ b/metadata/md5-cache/app-admin/puppetserver-7.9.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 INHERIT=systemd tmpfiles
 IUSE=puppetdb
-KEYWORDS=~amd64
+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.9.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b6d4b079ff7f9a1058802932e915a1fa
+_md5_=d71551c2f54c2f15fb883060e87e53f9
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 4d15003098d3..079b9ead7d65 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-1.31.0 b/metadata/md5-cache/app-crypt/acme-1.31.0
deleted file mode 100644
index 51ea0129d1c7..000000000000
--- a/metadata/md5-cache/app-crypt/acme-1.31.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[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/certbot/certbot/archive/v1.31.0.tar.gz -> certbot-1.31.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c9814c5fe10636117200f424a2865f42
diff --git a/metadata/md5-cache/app-crypt/certbot-1.31.0 b/metadata/md5-cache/app-crypt/certbot-1.31.0
deleted file mode 100644
index 10d98eb2e9d2..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-1.31.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=selinux test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[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/certbot/certbot/archive/v1.31.0.tar.gz -> certbot-1.31.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b158b00907cad1a8593aacbbfe97dfa5
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.31.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.31.0
deleted file mode 100644
index c8bea4fcf7e9..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.31.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[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/certbot/certbot/archive/v1.31.0.tar.gz -> certbot-1.31.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4e0da2f5bf20e7c35a5efb0a1235e20a
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.31.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.31.0
deleted file mode 100644
index d6b2a06dbf0b..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.31.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=8
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.31.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[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/certbot/certbot/archive/v1.31.0.tar.gz -> certbot-1.31.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=dbbdde535602fcf42bcb23d2f72ef148
diff --git a/metadata/md5-cache/app-crypt/pdfcrack-0.19 b/metadata/md5-cache/app-crypt/pdfcrack-0.19
deleted file mode 100644
index 582eb1a714b8..000000000000
--- a/metadata/md5-cache/app-crypt/pdfcrack-0.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Tool for recovering passwords and content from PDF-files
-EAPI=7
-HOMEPAGE=http://pdfcrack.sourceforge.net/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfcrack/pdfcrack-0.19.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b2c1bdb322bb796629f01eca88217703
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 406af0af96ed..0b0d95aa675f 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1 b/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1
new file mode 100644
index 000000000000..8cf4c13a507a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) 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:= ) bluetooth? ( net-wireless/bluez ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/ https://gitweb.gentoo.org/fork/cpython.git/
+INHERIT=autotools flag-o-matic pax-utils toolchain-funcs verify-sig
+IUSE=berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk valgrind wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) 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
+SLOT=2.7
+SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p16.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=9dd4f1f985f94276e82f0af85c3b567c
diff --git a/metadata/md5-cache/dev-lang/python-3.8.16-r1 b/metadata/md5-cache/dev-lang/python-3.8.16-r1
new file mode 100644
index 000000000000..d72623850bb5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 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-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) 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(+)] ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) 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.16/Python-3.8.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.16.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=8ffc00c0908a864bec9f5f036a6eea94
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 213ed4923025..39922aba042a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3-r1 b/metadata/md5-cache/dev-libs/confuse-3.3-r1
new file mode 100644
index 000000000000..492b6280664c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/confuse-3.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a configuration file parser library
+EAPI=7
+HOMEPAGE=https://github.com/martinh/libconfuse
+INHERIT=multilib-minimal flag-o-matic
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ISC
+RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/2.1.0
+SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=76c01a6019654b1ab84005f34d611d05
diff --git a/metadata/md5-cache/dev-libs/ell-0.53 b/metadata/md5-cache/dev-libs/ell-0.53
deleted file mode 100644
index 909c30a25efb..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.53
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-INHERIT=flag-o-matic linux-info
-IUSE=pie test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.53.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7a09b4c29b3c65ce0e120dd341d069ba
diff --git a/metadata/md5-cache/dev-libs/kirigami-addons-0.6.1 b/metadata/md5-cache/dev-libs/kirigami-addons-0.6.2
index 0bba23b72221..913b67ed8a36 100644
--- a/metadata/md5-cache/dev-libs/kirigami-addons-0.6.1
+++ b/metadata/md5-cache/dev-libs/kirigami-addons-0.6.2
@@ -12,6 +12,6 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kirigami-5.99.0:5 >=kde-frameworks/plasma-5.99.0:5 >=kde-frameworks/qqc2-desktop-style-5.99.0:5 || ( 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 )
 SLOT=5
-SRC_URI=mirror://kde/stable/kirigami-addons/kirigami-addons-0.6.1.tar.xz
+SRC_URI=mirror://kde/stable/kirigami-addons/kirigami-addons-0.6.2.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	52284263f68a4054362f6a2c9c78394f	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1978d0b4c8dfd9fd812521482c309137
+_md5_=d59351c5b473c091fc21696959064f7b
diff --git a/metadata/md5-cache/dev-libs/libcpuid-0.6.1 b/metadata/md5-cache/dev-libs/libcpuid-0.6.1
deleted file mode 100644
index 23a03e571851..000000000000
--- a/metadata/md5-cache/dev-libs/libcpuid-0.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) )
-DESCRIPTION=A small C library for x86 (and x86_64) CPU detection and feature extraction
-EAPI=8
-HOMEPAGE=http://libcpuid.sourceforge.net/
-INHERIT=autotools python-any-r1
-IUSE=static-libs test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://github.com/anrieff/libcpuid/archive/v0.6.1.tar.gz -> libcpuid-0.6.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ba6f407345517498d116ee7a3c2ee298
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.1 b/metadata/md5-cache/dev-libs/libtsm-4.0.1
deleted file mode 100644
index 73bec1d572b9..000000000000
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Terminal Emulator State Machine
-EAPI=7
-HOMEPAGE=https://github.com/Aetf/libtsm
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT
-SLOT=0/4
-SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.1.tar.gz -> libtsm-4.0.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=40c41bd6e88d16b72338e5177fe14ff9
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816 b/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
deleted file mode 100644
index e53c87cda724..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-DESCRIPTION=Redhat's Newt windowing toolkit development files
-EAPI=7
-HOMEPAGE=https://pagure.io/newt
-INHERIT=autotools python-r1 toolchain-funcs
-IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mlichvar/newt/archive/a7533580cd092e6a71c4ed722e830da4eb884d06.tar.gz -> newt-0.52.21_p20210816.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2170a44a238f4f892b16aa535ca8361b
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.22 b/metadata/md5-cache/dev-libs/newt-0.52.22
deleted file mode 100644
index 1c9a1e8e7d50..000000000000
--- a/metadata/md5-cache/dev-libs/newt-0.52.22
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-DESCRIPTION=Redhat's Newt windowing toolkit development files
-EAPI=8
-HOMEPAGE=https://pagure.io/newt
-INHERIT=autotools python-r1 toolchain-funcs
-IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mlichvar/newt/archive/r0-52-22.tar.gz -> newt-0.52.22.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1d634cdd6fb3d3c8b46a84a5e5a96117
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.23 b/metadata/md5-cache/dev-libs/newt-0.52.23
index 18152e99f1b9..8b127f39de6e 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.23
+++ b/metadata/md5-cache/dev-libs/newt-0.52.23
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pagure.io/newt
 INHERIT=autotools python-r1 toolchain-funcs
 IUSE=gpm nls tcl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/popt-1.6 =sys-libs/slang-2* gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mlichvar/newt/archive/r0-52-23.tar.gz -> newt-0.52.23.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8254f9cab66008f799bd61a1cd1d2c5e
+_md5_=9ee040a6ae2999c293f8ee41ee68b510
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index cbc213bf4996..2877315ac66f 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/python-keyutils-0.6 b/metadata/md5-cache/dev-python/python-keyutils-0.6
deleted file mode 100644
index ca3a0f322e77..000000000000
--- a/metadata/md5-cache/dev-python/python-keyutils-0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( sys-apps/keyutils >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/keyutils
-DESCRIPTION=A set of python bindings for keyutils
-EAPI=8
-HOMEPAGE=https://github.com/sassoftware/python-keyutils/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/keyutils python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sassoftware/python-keyutils/archive/refs/tags/0.6.tar.gz -> python-keyutils-0.6.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b066b5af563aac95cce010ae897b4a5a
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
index 8a72e953fcf4..14aacb443b36 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
@@ -12,6 +12,6 @@ RDEPEND=<dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
+SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c030f3dd56cc066d935f88e2a5ae6ea8
+_md5_=e108a728a3ba7aa067a6eead7fe7c23b
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
index 854c33fa98be..e2edfd0eeec7 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
+SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9b27e180318f9ef941c2f34ebd1da85b
+_md5_=dccd9876b161f55bec36b4aaf90b8627
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r3 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r3
index 5153cb94208e..8142ded8773a 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r3
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r3
@@ -12,6 +12,6 @@ RDEPEND=dev-python/pypdf[python_targets_python3_9(-)?,python_targets_python3_10(
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
+SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=70690455c94591ab96fef64589999632
+_md5_=46a8128556cc28f7ab19fd7073e999e9
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 5135ba3d1972..6b4270a0b35d 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.8-r2
index 796f42c9e96c..c44a22d0b184 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.8-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.8-r2
@@ -11,6 +11,6 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.8* =dev-qt/qttest-5.15.8* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.8* ) widgets? ( =dev-qt/qtwidgets-5.15.8*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.8-gentoo-kde-2.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtdeclarative-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.8-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=f48d08d929429c13ad8d625fb9ec965b
+_md5_=92d264ac55d9b12cd66988d169c10878
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1159c4742547..d182ddf19a25 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/facter-4.2.14 b/metadata/md5-cache/dev-ruby/facter-4.2.14
index ae1f05b570e9..a70956273693 100644
--- a/metadata/md5-cache/dev-ruby/facter-4.2.14
+++ b/metadata/md5-cache/dev-ruby/facter-4.2.14
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 INHERIT=ruby-ng ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/hocon[ruby_targets_ruby27(-)] <dev-ruby/thor-2.0[ruby_targets_ruby27(-)] dev-ruby/ffi[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/hocon[ruby_targets_ruby30(-)] <dev-ruby/thor-2.0[ruby_targets_ruby30(-)] dev-ruby/ffi[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/hocon[ruby_targets_ruby31(-)] <dev-ruby/thor-2.0[ruby_targets_ruby31(-)] dev-ruby/ffi[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ) || ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/4.2.14.tar.gz -> facter-4.2.14.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f81f3137084dd9df18dfe2b87755248f
+_md5_=999630a95da8e798db54e9d72449bf0c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b5d6fa9d018e..a4ced8a00dc2 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/breakpad-2022.06.04 b/metadata/md5-cache/dev-util/breakpad-2022.06.04
index 6c049aaab57d..73c3a4e32a4d 100644
--- a/metadata/md5-cache/dev-util/breakpad-2022.06.04
+++ b/metadata/md5-cache/dev-util/breakpad-2022.06.04
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/breakpad/archive/41a11409d6ba04e308adc66f5a33115e2d7c9174.tar.gz -> breakpad-2022.06.04.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7a77347a7041ca4542a20c228338705a
+_md5_=d9dfde007fee454b74d9f084a3abda52
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 3144b37daa67..3e71ef0b608f 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.20-r1 b/metadata/md5-cache/media-gfx/fotoxx-22.20-r1
deleted file mode 100644
index 1ef57b294cc2..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-22.20-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-INHERIT=optfeature xdg-utils
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.20.tar.gz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3334cff6f8be18b99d2d28c65d89d3a1
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.40-r1 b/metadata/md5-cache/media-gfx/fotoxx-22.40-r1
deleted file mode 100644
index 2325b3e7a46d..000000000000
--- a/metadata/md5-cache/media-gfx/fotoxx-22.40-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3
-DESCRIPTION=Program for improving image files made with a digital camera
-EAPI=7
-HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
-INHERIT=optfeature xdg-utils
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.40.tar.gz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=910c89740bfc0e93148f56eb587a1aea
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 06de9ae8e35d..49a658fab27d 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/obs-studio-27.2.4-r1 b/metadata/md5-cache/media-video/obs-studio-27.2.4-r1
deleted file mode 100644
index 578be102ee65..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-27.2.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libglvnd media-libs/x264:= media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-apps/pciutils sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo x11-libs/libdrm x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=8
-HOMEPAGE=https://obsproject.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake lua-single python-single-r1 xdg
-IUSE=+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libglvnd media-libs/x264:= media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-apps/pciutils sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo x11-libs/libdrm x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
-REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/obsproject/obs-studio/archive/27.2.4.tar.gz -> obs-studio-27.2.4.tar.gz browser? ( https://github.com/obsproject/obs-browser/archive/915761778ec1eae99e740ad4bf63b40db3142ee2.tar.gz -> obs-browser-915761778ec1eae99e740ad4bf63b40db3142ee2.tar.gz ) browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_4638_linux64.tar.bz2 )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=16b53d0eadb37758fadbb4bb8c2adf67
diff --git a/metadata/md5-cache/media-video/obs-studio-29.0.0 b/metadata/md5-cache/media-video/obs-studio-29.0.0
new file mode 100644
index 000000000000..e2ec2cb7dc78
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-29.0.0
@@ -0,0 +1,17 @@
+BDEPEND=lua? ( dev-lang/swig ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 dev-libs/jansson:= media-libs/libglvnd media-libs/x264:= media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-apps/pciutils sys-libs/zlib:= x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo x11-libs/libdrm x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) qt6? ( dev-qt/qtbase:6[network,widgets,xml(+)] dev-qt/qtsvg:6 x11-libs/libxkbcommon ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5[wayland?] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l virtual/udev ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon )
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=8
+HOMEPAGE=https://obsproject.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake lua-single optfeature python-single-r1 xdg
+IUSE=+alsa browser decklink fdk jack lua nvenc pipewire pulseaudio python qt6 speex +ssl truetype v4l vlc wayland websocket +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Boost-1.0 GPL-2+ MIT Unlicense
+RDEPEND=dev-libs/glib:2 dev-libs/jansson:= media-libs/libglvnd media-libs/x264:= media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-apps/pciutils sys-libs/zlib:= x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo x11-libs/libdrm x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) qt6? ( dev-qt/qtbase:6[network,widgets,xml(+)] dev-qt/qtsvg:6 x11-libs/libxkbcommon ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5[wayland?] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l virtual/udev ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon )
+REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://github.com/obsproject/obs-studio/archive/29.0.0.tar.gz -> obs-studio-29.0.0.tar.gz https://github.com/obsproject/obs-browser/archive/fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz -> obs-browser-fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz https://github.com/chriskohlhoff/asio/archive/b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz -> asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz https://github.com/nayuki/QR-Code-generator/archive/8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz -> qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz https://github.com/nlohmann/json/archive/a34e011e24beece3b69397a03fdc650546f052c3.tar.gz -> json-a34e011e24beece3b69397a03fdc650546f052c3.tar.gz https://github.com/obsproject/obs-websocket/archive/31f9845b6132e6c1529401292bc1125401e2a324.tar.gz -> obs-websocket-31f9845b6132e6c1529401292bc1125401e2a324.tar.gz https://github.com/zaphoyd/websocketpp/archive/56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz -> websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2 )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5e731b9e3da902a95bd77c0b2b511410
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index d0438589532e..ccd431ad699b 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_l
 SLOT=0
 SRC_URI=browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2 )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7870d60e8b98856ef02d33397fd5ec0f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=497a520b7af562ab0690a20ce1d3b0fb
+_md5_=6c528f1028d3a733059d5feb7b5306ee
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index ef1b560d7642..d43180fcb7ba 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/pdns-4.7.3 b/metadata/md5-cache/net-dns/pdns-4.7.3
index 49c1e42ae73d..37549e14b659 100644
--- a/metadata/md5-cache/net-dns/pdns-4.7.3
+++ b/metadata/md5-cache/net-dns/pdns-4.7.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 INHERIT=flag-o-matic lua-single
 IUSE=debug doc geoip ldap lmdb lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= dev-libs/boost:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) ) acct-user/pdns acct-group/pdns
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.7.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b536f35d191772814fd2b754486dd644
+_md5_=ea9c9ff6697cab666f068c2b9bff3a8c
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.7.4 b/metadata/md5-cache/net-dns/pdns-recursor-4.7.4
index e1bd85ca742e..f3792c8df367 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.7.4
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.7.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 INHERIT=flag-o-matic lua-single
 IUSE=debug dnstap snmp sodium systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) elibc_glibc? ( arm? ( >=sys-libs/glibc-2.34 ) x86? ( >=sys-libs/glibc-2.34 ) ) dev-libs/openssl:= dev-libs/boost:=[context] !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.7.4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=82d877e92d4934fad1dc7031ba57dc4b
+_md5_=180f3912af57581f9a54b1d336ea9eda
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d31bcc13b095..c0449f869591 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libquotient-0.6.11-r1 b/metadata/md5-cache/net-libs/libquotient-0.6.11-r1
deleted file mode 100644
index b6f8e6c66cb2..000000000000
--- a/metadata/md5-cache/net-libs/libquotient-0.6.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl]
-DESCRIPTION=Qt5-based SDK to develop applications for Matrix
-EAPI=8
-HOMEPAGE=https://github.com/quotient-im/libQuotient
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl]
-SLOT=0
-SRC_URI=https://github.com/quotient-im/libQuotient/archive/0.6.11.tar.gz -> libquotient-0.6.11.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0755c76fcc9eada2ecf60b999bb5c362
diff --git a/metadata/md5-cache/net-libs/libquotient-0.7.0 b/metadata/md5-cache/net-libs/libquotient-0.7.1
index 0dc8bbc06f50..c1aab281c7de 100644
--- a/metadata/md5-cache/net-libs/libquotient-0.7.0
+++ b/metadata/md5-cache/net-libs/libquotient-0.7.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl]
 SLOT=0/0.7
-SRC_URI=https://github.com/quotient-im/libQuotient/archive/0.7.0.tar.gz -> libquotient-0.7.0.tar.gz
+SRC_URI=https://github.com/quotient-im/libQuotient/archive/0.7.1.tar.gz -> libquotient-0.7.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aca8e305376515be8fc5031e9d2219c9
+_md5_=4fc95367084764e7d287ce9af341252e
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f4950a18abf7..2913883dbd3c 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/iwd-1.30 b/metadata/md5-cache/net-wireless/iwd-1.30
deleted file mode 100644
index 5489b716d239..000000000000
--- a/metadata/md5-cache/net-wireless/iwd-1.30
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.53
-DESCRIPTION=Wireless daemon for linux
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
-INHERIT=flag-o-matic linux-info systemd
-IUSE=+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.53 acct-group/netdev net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.30.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8249af1536d1af8f0b648a58a7af8dfc
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 33c3a9eb8fb9..851f25ec1353 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
new file mode 100644
index 000000000000..0f91bd9b3aea
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+DESCRIPTION=A basic utility library for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
+INHERIT=vala
+IUSE=+introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/7
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.18/libxfce4util-4.18.1.tar.bz2
+_eclasses_=vala	2633382950a3a9ce912c9258150d5db8
+_md5_=3fbbbb40aeeb0e8ae0ed3bb151448008
diff --git a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.0 b/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.0
deleted file mode 100644
index b3757cba2c7a..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig wayland? ( >=dev-util/wayland-scanner-1.15 )
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=x11-libs/gtk+-3.24.0:3[wayland] >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/gtk+-3.24.0:3[X] >=x11-libs/libwnck-3.14:3 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=8
-HOMEPAGE=https://gitlab.xfce.org/xfce/libxfce4windowing/
-IUSE=+introspection wayland X
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=x11-libs/gtk+-3.24.0:3[wayland] >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/gtk+-3.24.0:3[X] >=x11-libs/libwnck-3.14:3 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4windowing/4.19/libxfce4windowing-4.19.0.tar.bz2
-_md5_=68311b79176327df45005c4899b061cb
diff --git a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1 b/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
index 0457c39d0207..829cf8b9e00e 100644
--- a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
+++ b/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
@@ -1,13 +1,13 @@
 BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig wayland? ( >=dev-util/wayland-scanner-1.15 )
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.68.0 >=x11-libs/gtk+-3.24.0:3[introspection?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=x11-libs/gtk+-3.24.0:3[wayland] >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/gtk+-3.24.0:3[X] >=x11-libs/libwnck-3.14:3 )
+DEPEND=>=dev-libs/glib-2.68.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/libwnck-3.14:3 )
 DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=8
 HOMEPAGE=https://gitlab.xfce.org/xfce/libxfce4windowing/
 IUSE=+introspection wayland X
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.68.0 >=x11-libs/gtk+-3.24.0:3[introspection?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=x11-libs/gtk+-3.24.0:3[wayland] >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/gtk+-3.24.0:3[X] >=x11-libs/libwnck-3.14:3 )
+RDEPEND=>=dev-libs/glib-2.68.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/libwnck-3.14:3 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4windowing/4.19/libxfce4windowing-4.19.1.tar.bz2
-_md5_=443089ced3b2b9d7bbabbc76e40dfc11
+_md5_=9a2c6cf8c118b6cbbfbbcd959c8ee6cd
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6
new file mode 100644
index 000000000000..995266d4ddcd
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://www.xfce.org/projects/
+INHERIT=vala xdg-utils
+IUSE=+dbusmenu introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.6.tar.bz2
+_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ff77a2e77f212a610eab33137947b204
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.5 b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.5
deleted file mode 100644
index 5ca846c29ec1..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.5.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e170c9171e79443b09793e76d1308b02
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
new file mode 100644
index 000000000000..d3347ee63ed0
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
+INHERIT=vala xdg-utils
+IUSE=+dbusmenu introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.1.tar.bz2
+_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4efe05a01c6bfba07e855a5ad0bf81b8
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0
new file mode 100644
index 000000000000..0dbdfd2ab56e
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0
@@ -0,0 +1,16 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.72.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.13:= X? ( x11-libs/libX11 x11-libs/libwnck:3 ) dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( >=dev-libs/wayland-1.15 >=gui-libs/gtk-layer-shell-0.7.0 )
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
+INHERIT=vala xdg-utils
+IUSE=X +dbusmenu introspection vala wayland
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.72.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.13:= X? ( x11-libs/libX11 x11-libs/libwnck:3 ) dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( >=dev-libs/wayland-1.15 >=gui-libs/gtk-layer-shell-0.7.0 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.19/xfce4-panel-4.19.0.tar.bz2
+_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f78c9e6629e3f78cc2d2fcb2339ba34e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e08b560b7da0..b7f802389c6e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-10T17:44:23Z
+TIMESTAMP 2023-01-10T22:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO9o/dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO96S1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDyRQ/8DHhkMqAVAWIdJzggQHytQdW2rvyHcZQJh5wfo33a2ZjgF4iC5052Ol3r
-XNyHvYQ/bX/q5fAama9ltdfv7l1XfAVTDFIm8VSABV2Q+4OwtL9ip4bGaZZfuMBW
-WfNbUjcJCPAriB9JzVEc6QP4DosUztY0POa4k0/KapJpt3cYCzL5f1t6iSB3RolT
-3jxrD12CPkhE0vEWTMc8PZ3cTkwJRKEctCjY4Z/IMQHdEgR5AZ0x5l15diD0cDU7
-ud2OjaTgzA9CyaagPSHsXWq9Y7qW7ZV7e8dQAEFhvv4I6aS0Cjj6AVMv9Jy+BO3x
-gJExoYAss2QYZo1Cq/UsKD/ogCe1Vo8s20cOEvhhWCQLYqwZGRgKUaV1reIYIiuV
-UQLPQJgMar0OKFKUfVC2PkRWNRRoxg6luzzoamoTyQswFho/WItbWPWHnk5k/sIe
-RvkDE8bqc+4uPSaMPRcxjO+UdXhci+d8mMQuHx0LlS1uGfDSyWR6aGqjyKakvu35
-tGoifD3OFex5/lOobjFdpuRP9vlIxcrfupxHdOGNV9j2UouN8RRevshAeEhfb2s0
-qMUZ+R5wHq9s1Tj7QsJDmK2s6pMzUFv8VlYyftuksV0RPKIBIVIcDuy5CUGMLmAo
-84E0LBniO5Xyf8Jn73aXQMU/0BPjJW9cEAPe9zY1HAXIursXAAw=
-=hiSZ
+klDkkBAAlyUeNnLH6PuLuSAWToOxcXO0UuO6Ebsi9ArHdWUUoAQEF5xs6em8yfT5
+8Q4xXOoGmrGAHeesLHqqqHIf2Ui7U2JfCmfm9KpyYu7NqS1CBxR46VsxpG+k26m6
+eL8/65CP811c62DBUmrwRoNz7n1E3E3F1P2o3hTZRmGatqMERnGV4ELSE5sBhgBq
+/kgDzE6VzON3Ea9H3WEtNdKBrWnUZfFVdGScEKkwta9k5LEArz73sWEKMFZiIPU2
+NvAs9hFlFKRUr6b432BskqurTZhsGublHSfmY+3KIczjAuNpApPeXGiiw9RCeFnd
+28+EKG2jtt5zqi40kpKFRCZpRcdcSZf2dwFWeGyUVm6ZBnpLIUwGvMfuOfqc9xFD
+AWCGIU5G9M72S1SYpgReCIbVcTdA3PwzH5y87xegwwH923MjgEJzhAc7oOV1p4Cw
+3pOd54r8VLR6vRpUTIr8Z2M35YVAvuHktSCjON0kc6UnR19uLqARX1/7eFz1GwVQ
+9tJB5UWuCBdwlDYSBN/F8ze5cqUV41bD5QPx2iCVH4MFTVfKaFBpBQq1tAS1+JBN
+pezcC4s3vMKM4EjsMkaiUpHYfUCbckqJ/KrgTHFvSLpYoo+WpZmN2iskrP2Yl9B9
+R+Bvd9gXGtJS2gX9h5gst8VFichdFIvhiKbKaj303aILUmE2q4A=
+=7/2m
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index eef90edc1175..f0ba6b7583da 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Jan 2023 17:44:21 +0000
+Tue, 10 Jan 2023 22:39:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index cf37b3a015b1..6ae5f1b2d3a8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jan 10 05:44:20 PM UTC 2023
+Tue Jan 10 10:39:38 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a7296ebea3e1..d9a9b815e15b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Jan 2023 17:45:01 +0000
+Tue, 10 Jan 2023 22:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5c2bb34fec6f..24e462c4156e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-496ddfcc047cdad17456532b3045dfd4c1e829b7 1673372073 2023-01-10T17:34:33+00:00
+fc739e1dc8754f392d461c3612a7a438e63aea84 1673386061 2023-01-10T21:27:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 55a92fb810b4..5a8ceed8833f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673372401 Tue 10 Jan 2023 05:40:01 PM UTC
+1673390401 Tue 10 Jan 2023 10:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index eef90edc1175..f0ba6b7583da 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Jan 2023 17:44:21 +0000
+Tue, 10 Jan 2023 22:39:38 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b78813d8a2b0..614897929749 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 6735d8a2594f..6ed8383a0de0 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -5,6 +5,6 @@ DIST pdns-recursor-4.7.4.tar.bz2 1609031 BLAKE2B b051a77f1c734546b26c3bb0030c0e5
 DIST pdns-recursor-4.8.0.tar.bz2 1530308 BLAKE2B 8b915e5247aa973045e345150dd529e89585493808b4b34e956ee22d337a1af04180243d727803bb1be10e38edcd16956c84a9ae541cd4c0a9a15e851977729c SHA512 ec49de1d6d6d6b7fe10470afd8f5969a46a911ffc346001ef8f4035ba2b479de8a88f39d7d24059c4825ca466c21032f59283b181449d8d2cc9e3ff55cca10e4
 EBUILD pdns-recursor-4.7.2.ebuild 2029 BLAKE2B c4ba893123a434d8f322b97e42aefb2be0fdc20a75ea295578f4a65aa7bb4036445001594057a6a58a0c077713b7677cd31cf8ef01fdeed890bf0cbd5fb55df4 SHA512 579ce51506f57adde7f349920c7132c71dfea3da863e7f316341db52244d4d1f5a9dce27f4529ff28223fe0bccde21eb43653ea433f6080511a673596cef7ebf
 EBUILD pdns-recursor-4.7.3.ebuild 2029 BLAKE2B c4ba893123a434d8f322b97e42aefb2be0fdc20a75ea295578f4a65aa7bb4036445001594057a6a58a0c077713b7677cd31cf8ef01fdeed890bf0cbd5fb55df4 SHA512 579ce51506f57adde7f349920c7132c71dfea3da863e7f316341db52244d4d1f5a9dce27f4529ff28223fe0bccde21eb43653ea433f6080511a673596cef7ebf
-EBUILD pdns-recursor-4.7.4.ebuild 2031 BLAKE2B b4b7c64ae31ac08e78f8c5515a00cfca29178b4eb2c6321285ab26865bec32fbb3f31fa08f76e44bd2fc92bd241833b2de72280129eaf4b3e49f0fb83f762c34 SHA512 d56abd948f796694d72f537e5c72a6daa14ae5518c72f82048094625c987796c82d741de59c82aeb809b85a9cc805fc64be0a78bd17f52ac22fb041ceb35eaaa
+EBUILD pdns-recursor-4.7.4.ebuild 2029 BLAKE2B 85db5f944366b30667cd69b58b03486f2313183772b75c5cc644b9491250df952878580f395e8603098e8284315798fcf1f8645fb3ac1e9567b595cb03014583 SHA512 342056ba077131df56a323c8faa4dc0a8605ee16388b339ddae388087857f8ead65bb24dc55f352a5aecc723e6a2fffcc3b89872d1c2e0c389d2408991be783a
 EBUILD pdns-recursor-4.8.0.ebuild 2031 BLAKE2B b4b7c64ae31ac08e78f8c5515a00cfca29178b4eb2c6321285ab26865bec32fbb3f31fa08f76e44bd2fc92bd241833b2de72280129eaf4b3e49f0fb83f762c34 SHA512 d56abd948f796694d72f537e5c72a6daa14ae5518c72f82048094625c987796c82d741de59c82aeb809b85a9cc805fc64be0a78bd17f52ac22fb041ceb35eaaa
 MISC metadata.xml 930 BLAKE2B 997ed7f557ddae9d8a5b3f92396cb5acb9cde67de5cc750c4c3b051635557ff22fcdd94400a95cc7e5328ccca9786fe3b780c81d57f785865a18e68701916d00 SHA512 3415ed721ad143cae712ee309ba9f3057273b8e594617fe12382bd316cad7dc6e2ed66d660d9c13fa3db993852c85f21d1ea1c0367e595dd5bbf782add225cd1
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
index c8d6a1da1b22..7f51d73cc251 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 20256f6f4508..989ac1fb5419 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -5,5 +5,5 @@ DIST pdns-4.7.2.tar.bz2 1359883 BLAKE2B 5b1571cc2ae51675877810e8e298f02e6319f830
 DIST pdns-4.7.3.tar.bz2 1353333 BLAKE2B 9dc693c940af08755dcf2c77d103bf219e453684f1714eb0790bc06b68ee01872fafc29ab7ba62a8d2cde9dc0035c527d9f241afe7fb170821dfeb5b6c32242d SHA512 25ca5ef04297efc56f6b88e06177d0db5ed390844225dbc53bff6a9299ba3f711aa27642adca31df0f04e6af7059280690a3793458090cd6b2703cbc4fc9072a
 EBUILD pdns-4.6.3.ebuild 4539 BLAKE2B 9289eca73dbaf0a68a5d5a8ea873671f3954def7299dcfaf65b4bfa936f39d9138db3dec9b2c596bbc4c787de4a3574b60f498738772667cba71443babd5af7e SHA512 014166a1b347a9e76510e202afdbcafe29ebad112b0a43a15ebebd19d772dae268161e574cab818b0971f162a0a27abd3c9f5eef6a0db275c8c851a72bda8291
 EBUILD pdns-4.7.2.ebuild 4541 BLAKE2B 1ce28873123969fdc7f9811f0628c4a3496ce16fdd3c866864b7b70b185fe4d4e8f326eadd31bf89a87baa2f95512f7bf9570c597578cc08c5e91efe071a7050 SHA512 cdb4c8b37d4f79b37f21e5e1216e3bf000c985d1061b94fc4eeeded895ff14e4b926c9bb3947f6ab029d6ea5ffa0bc560e130e543cfa166736f95909f19bcc5b
-EBUILD pdns-4.7.3.ebuild 4541 BLAKE2B 1ce28873123969fdc7f9811f0628c4a3496ce16fdd3c866864b7b70b185fe4d4e8f326eadd31bf89a87baa2f95512f7bf9570c597578cc08c5e91efe071a7050 SHA512 cdb4c8b37d4f79b37f21e5e1216e3bf000c985d1061b94fc4eeeded895ff14e4b926c9bb3947f6ab029d6ea5ffa0bc560e130e543cfa166736f95909f19bcc5b
+EBUILD pdns-4.7.3.ebuild 4539 BLAKE2B c83d114712973c6bdebde9ef06acad31c0a3d20df303f9def05bb62a564d8427a5bda869d3bf01d0f1c7899aa97912975c61c2a61e9f7c461f349c342635674c SHA512 5a8d824760762a9f28cf45d030a793ab62ac2ce6b76067df9512a1d90dab57c9a53efc0d8262ca4aff15327f6fe6160dc4cc592bb57b1b6e46e59b3eb6bd3983
 MISC metadata.xml 1080 BLAKE2B 536be9df9d0d9f8ec3f267740ad37da3bcd854ffe12582d9355bf04a75e5620eaf87483d4bed61bee8c20fd1ac2a8a7fa280585f94400472c5b374c84042dc1a SHA512 437aa6d097f9adce27acd8ae5b1a49ed048d58fd49ca9203d6d73df4728448b2d00299ce0d9e98656dca64b1f70f124c811cd435461e65dbeb1ff23fca00ae19
diff --git a/net-dns/pdns/pdns-4.7.3.ebuild b/net-dns/pdns/pdns-4.7.3.ebuild
index 4f2153110553..f7d8c8a36691 100644
--- a/net-dns/pdns/pdns-4.7.3.ebuild
+++ b/net-dns/pdns/pdns-4.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f2f71c37c793..0ff0f1f9d573 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index ae9d0892b0ab..e19d7becd550 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,9 +1,5 @@
-AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9
-AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
 AUX libquotient-0.7.0-no-android.patch 969 BLAKE2B 775a680ed803047c7bd5fd72a9a40f0a9540921a6004fe8242c0df9a849d868100283a3ebc4e586e0b50de4e3cf7dc1ba8d9731b427515bc4f90196e61fab1a9 SHA512 27d56906e23ae8f56696ca9d7aeafc15398f81286cafd4f2eae54638b16819ec3fcd40a53b96953b3f62eb4982e09db1abc00e8e76abd61a55343752fb5e5ad4
 AUX libquotient-0.7.0-no-tests.patch 1234 BLAKE2B 60a3da8a15c9c77d8c997b0c0d95a6e13e9d332fdcbee2e6a88882269969519a82daea1280721ff6661a410f03fbd43d5233d8f4804896af637dfca67dd7111f SHA512 e2aa9d7ddca5d7cbb9323d3be9551515b726293c14eb34b4374f701082d9ce21af9f39836ecfada4247b25f1fe6b8fdd2f62976c32658e7d48266f02123ff582
-DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa
-DIST libquotient-0.7.0.tar.gz 667312 BLAKE2B 020baf8bcbbcedd6220e4f3476b152b3a0e88d53786e5b4575f9c096aa36847220a186ca782e068b2fd1f54771e45e1b313d10913af2cc2be3a1c45074acb733 SHA512 6770e3caa6198a77fc33bf7edd2a34d5673e01474b639aa020af989046ff04c44ff5ce26b6418ae31fcca49cc54a147052153ed5c60706f26c177ebd57d452c5
-EBUILD libquotient-0.6.11-r1.ebuild 884 BLAKE2B 0981774edca56b1d36903fb93f6e7e07cd2a0a2588b3be94cfec0e5c08dbad1a5ec698712b4e9eebb667688e196e654f9203201ae94e8b452cda61d6e21df37e SHA512 8cf90f54efed70cd3244c6dddc5a057032a595133467d8f7872035156f931a4b55fed51adb407e81afd2552a6522fb4d297b1988e305a92c1d06493954cc1281
-EBUILD libquotient-0.7.0.ebuild 878 BLAKE2B 71c2e1d26aaf4973c744a63c142fa0718c9b89e9bd38b76fee8115934e3329c7d0a8d34df1ce3891e627168d80ace5efcc72101b6a63d89430466c4cbc747d01 SHA512 fd443872405381afe418b68b971e2bee2d91dc081f1ececd70d269bcb3bc6587d71f7e1b6aba7041759a6d7c8ef4ddd8e96627ae8127ba558891499f0867f283
+DIST libquotient-0.7.1.tar.gz 667590 BLAKE2B 93c601960c43511ba0118ac0224c34064a6c1b1fa9a526ca8a064495e8d5b981ab197ed958ced3ba4bf869e0554ee37d2be82cddb6610e9d5ef371a1d3a144a7 SHA512 88819cafb49712d53c692008be69ea1fc01ca1ac6aedc15696eba2f830956660d185fb07273d50c7dc3e9208314ac24838746d5d9e70b3aad7fccbd15fd7c545
+EBUILD libquotient-0.7.1.ebuild 892 BLAKE2B d6972f361756787e468bd456b22429263809cf4c5f1abc69938041611c3bf1253d3573abb6e6c65891188a8087dd42d0cbe712e83f6f8d97382498812f69a675 SHA512 8f0d14f2e2274e5d5545e1738b2c547480e8189cabd04ccf152d1b4ffb446836e9438a93cac0e660d02dbdcf37bfec259e80621801e37b4c6f2137c675a9db0e
 MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch
deleted file mode 100644
index 5541f4d7133b..000000000000
--- a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d82cb1f43cab7976e25c6e9ff3e4ae17789ee11c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 3 Jan 2021 15:18:01 +0100
-Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ee1cb4..eec27c8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -321,7 +321,10 @@ install(FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
-     DESTINATION ${ConfigFilesLocation}
- )
--install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules)
-+
-+if (ANDROID)
-+    install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules)
-+endif ()
- 
- if (WIN32)
-     install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages)
--- 
-2.30.0
-
diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch
deleted file mode 100644
index fb884e10ac76..000000000000
--- a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff972d181f0f9e7bfa327c71450d55f951de27c1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 3 Jan 2021 15:05:59 +0100
-Subject: [PATCH] Put Qt5Test dependency behind -DQuotient_INSTALL_TESTS
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ee1cb4..2a0908d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,7 +58,7 @@ else()
-     endforeach ()
- endif()
- 
--find_package(Qt5 5.9 REQUIRED Network Gui Multimedia Test)
-+find_package(Qt5 5.9 REQUIRED Network Gui Multimedia)
- get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE)
- 
- if (${PROJECT_NAME}_ENABLE_E2EE)
-@@ -280,9 +280,12 @@ if (${PROJECT_NAME}_ENABLE_E2EE)
- endif()
- target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Gui Qt5::Multimedia)
- 
--set(TEST_BINARY quotest)
--add_executable(${TEST_BINARY} ${tests_SRCS})
--target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME})
-+if(${PROJECT_NAME}_INSTALL_TESTS)
-+    find_package(Qt5Test)
-+    set(TEST_BINARY quotest)
-+    add_executable(${TEST_BINARY} ${tests_SRCS})
-+    target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME})
-+endif()
- 
- configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY NEWLINE_STYLE UNIX)
- 
--- 
-2.30.0
-
diff --git a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
deleted file mode 100644
index 6e9390a92391..000000000000
--- a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libQuotient-${PV}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
-	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQuotient_INSTALL_TESTS=OFF
-		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/libquotient/libquotient-0.7.0.ebuild b/net-libs/libquotient/libquotient-0.7.1.ebuild
index 11ec72e83ea7..4a30091b1f75 100644
--- a/net-libs/libquotient/libquotient-0.7.0.ebuild
+++ b/net-libs/libquotient/libquotient-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,8 +26,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# downstream patches
-	"${FILESDIR}"/${P}-no-android.patch
-	"${FILESDIR}"/${P}-no-tests.patch
+	"${FILESDIR}"/${PN}-0.7.0-no-android.patch
+	"${FILESDIR}"/${PN}-0.7.0-no-tests.patch
 )
 
 src_configure() {
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index d571c8a69dbb..9ac01eda96d5 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index c322a022c2b6..f42e2ca6ec35 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,10 +1,8 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.30.tar.xz 1026436 BLAKE2B 02382181d8e40d0d88c6c752c480db1036142c91b2547499456763bb9c157c7113f9c496d5dd0ae688110fab251e7f99374ea560450a12701e5d72ec7eae784c SHA512 8cf705bd6cf2c69bb6fef0274f3a59f64e7a88071bf97fe3f291ebe523d38f1381299918370d7017b4e635fd1907005c530e8e693eff94d99ac5b89aebf9f815
 DIST iwd-2.0.tar.xz 1056120 BLAKE2B ec9bb9968640f2b27571824db068596bc06f383898a96b478eb09488b1d981f198b7204ef8fabbe3c17d6450a138166288b6f55b843ee3ad90b121da4d07edd0 SHA512 2939acf7fc6f8a2c93115dac04d700a9983ce6ad61687b64fac1cfff9d24b7c162751388b8b403e4280686072c7e1556c993205757cd99b0cc8b849dbf2e3478
 DIST iwd-2.1.tar.xz 1056916 BLAKE2B f807008f3ed8341082e95fc9bbf55aa3d752db9246543cd7e280460bf534e7672ad34dced14ec3e1ba837adaab4c5e4b0b77b41930687cd29229f0b832c20361 SHA512 44ae26efa2fce733d24d3fcfc4f1791af4c54f9469154570285282c8de1d55ca79818a1501c1c4fc3797d1a951b15f06410400eaa07a29dbc5f351ecc704c24b
-EBUILD iwd-1.30.ebuild 4963 BLAKE2B 09e6f2a5a1624ecfbab8ca67378a034ee80eb22bc68dcc177852466134b3685f7e9248c5a3ea673cfc2eed2bb0d7739d18b403f0e576edd8f0a253750b8c1ece SHA512 f62f5124b70906e725d96715b0c6d86904090ffe798baef3065f7dcbf2e22a919600e7a720dd16df6a5175bbc2b68e09e8c148bfb55088c868e1a1278c581cf5
 EBUILD iwd-2.0.ebuild 4963 BLAKE2B 21e40007ffa1aa6d5c0be8eac3f4dd102fb7f1fdb382522d9895365e7d219c49a67d7dfe0491fb30b34f9da6a8401e77c61cf258efa66248e50e7b41704becb1 SHA512 55e5c14fe80ea141c47c47b94f1e124a54080356681bd79c842f44d4354982a01c14fe16fe58e05375ca6d24f2077f15bf13466a248996031925ee2ae064d800
 EBUILD iwd-2.1.ebuild 4969 BLAKE2B 82e6498e7bd44ab5e9bf2d5d27382564da95ca0bb7efa52cbfe20b97c2076495ce7c01b5ccf04ff84f9281a9af57b69b916b4c3b714eddc44ffa4eec3fb34937 SHA512 2c74b9aafd448890022a6eda89b48da6c4ca2643c85c666820820033bcf12149afdc617f4ef2a06957f8c448d4f9e7a67c5e33b84e2d5f6f5e0a2b1b224b6fce
 EBUILD iwd-9999.ebuild 4946 BLAKE2B 97fea4e22faacc58c2e205a328f9d490c1ba3505fe24f312aaf11a664eeb838d156d9e735b15dba9ce90e109cc6b8b11debe26bf015f4a40ef1f1f26d1401143 SHA512 4733f222626ef30742fa473b01dbd91379456c1d07360dd4ccfdca64387b3e9d381399d5e562a8bda6682b816a43bf45ddf0183875088954ba0681f472259d0b
diff --git a/net-wireless/iwd/iwd-1.30.ebuild b/net-wireless/iwd/iwd-1.30.ebuild
deleted file mode 100644
index ab80ac4671f4..000000000000
--- a/net-wireless/iwd/iwd-1.30.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.53"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-	MYRST2MAN="RST2MAN=:"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
-
-DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/netdev
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-	fi
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake ${MYRST2MAN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${MYRST2MAN} install
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9013bdc48c3b..515332609851 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 84013de3c2db..e8af0e382b34 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Alfredo Tupone <tupone@gentoo.org> (2023-01-10)
+# They were added as a dependency of sci-libs/pytorch
+# but they are no more
+# Bug #890365
+# Removal on 2023-01-30
+dev-util/breakpad
+dev-libs/linux-syscall-support
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2023-01-10)
+# Unmaintained and reportedly broken by KDE Plasma 5.25 already.
+# Masking current stable version is the first step towards last-rites.
+# Consider migrating away from latte-dock for your workflow.
+# See also: https://tinyurl.com/39dkw43a (links to reddit)
+# Removal on 2023-01-30.
+=kde-misc/latte-dock-0.10.8*
+
 # Sam James <sam@gentoo.org> (2023-01-10)
 # This version had a controversial licence change which stinted its adoption.
 # No reverse dependencies.
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index bae0f48dd55a..3c0d612bdcba 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 4c9f94335e1b..a59e3566ef56 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,10 +1,6 @@
 AUX automake-1.10-perl-5.16.patch 3555 BLAKE2B 8128b27ade89b12445b02532d9837ff469e6d0e1be3ebab6969d8d68c3a57a27e25ff89db82ed8abf3eff6d392bbd3b91a0b5b6b0827e7eec1279bc5345dc024 SHA512 050d66f3f1b4aed6482a234b32bbdbe231ddea0c9f4fb2ff97e963095ad69a487fd65986189fd659fbe8d8d011f3f866e92e506e653fd832d2adaf3263ed33fc
 AUX automake-1.11-install-sh-avoid-low-risk-race-in-tmp.patch 3016 BLAKE2B 8dbc2ae72f8d687e785be6dde22429305cdbbb2b441a05ad268d5a7f019b087e090d7b93cb5ff033d004a8344fc9056172f1a16bd0bfa98501e1c55cf6933c54 SHA512 0f6c6ee15c895b64742113156f9864396daa6d7680897e4795909c78cb300df0d96c63091a39e901c2d62e76852fcbb49a5be747cb4b381c4346b81c0c570149
-AUX automake-1.13-dyn-ithreads.patch 2126 BLAKE2B 13fa89641077b7e9e7052441b84b756d7ddbd1ac3b87857028ccb34feb4528d774400fc411bf4fa54bbed697d8be6bf948d774d474f0638611c52f8d98696951 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277
-AUX automake-1.13-hash-order-workaround.patch 529 BLAKE2B 92706c8c87aa1722de4ee4bbffd815720dfbc3d124776f7118ca57d682bbb9475174357412bb7e9f79c98adeb03651087cb095b52e682aa14447ab012945ca6a SHA512 2899c650664ead4c5fb4fdae79605b665cad52c3ecda0f8192e2ca37dbfdb42eb5937f9a24622e6463d4c003d70186b8a4c1404a47bd387de36d9f0db03e5593
 AUX automake-1.13-perl-escape-curly-bracket-r1.patch 1127 BLAKE2B 18664d2af473845f6ae91ab566651a53cbcf16df598adc3812f6d40f774c2c571c20dada4f23193b2b39ddc36c5fe9fea0449f32231540477fbf2260a7052c51 SHA512 25d94503572f70a5f9ab808057ca1ad7080cba89cf98c2b1664da2dc347f8ada1db6a97138a9b3ee12ffa54a37a34307a9fded4c069e1eb20e490556ad4f46d3
-AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55
-AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
 AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
diff --git a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch
deleted file mode 100644
index f790e7724c93..000000000000
--- a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/343439
-
-From 182626687f2640609f8eb28ad1b04b078342f2c7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 12 Jan 2013 00:19:40 -0500
-Subject: [PATCH] ithreads: use runtime (not configure time) detection of perl
- threads
-
-I can't imagine the runtime checks being a big runtime penalty, so there
-shouldn't be a need to do the checks at configure check and hardcode the
-result in the generated automake.
-
-With the current system, it means if you change your perl config (build
-perl w/threads, build automake, build perl w/out threads), or deploy a
-compiled automake package on a different system (build had threads, but
-deployed system does not), you get errors when trying to run automake.
-
-So take the logic from configure.ac and move it to the one place where
-PERL_THREADS is used (lib/Automake/Config.in) and do the version/config
-checking at runtime.
-
-* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed.
-* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code
-related to these two variables.
-* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to
-1 if the perl version is at least 5.007_002, and useithreads is in Config.
-
-Copyright-paperwork-exempt: yes
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
----
- bootstrap.sh           |  2 --
- configure.ac           | 26 --------------------------
- lib/Automake/Config.in |  9 ++++++++-
- 3 files changed, 8 insertions(+), 29 deletions(-)
-
-diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
-index fe6ef9d..885e74e 100644
---- a/lib/Automake/Config.in
-+++ b/lib/Automake/Config.in
-@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
- our $VERSION = '@VERSION@';
- our $RELEASE_YEAR = '@RELEASE_YEAR@';
- our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
--our $perl_threads = @PERL_THREADS@;
-+
-+our $perl_threads = 0;
-+# We need at least this version for CLONE support.
-+if (eval { require 5.007_002; })
-+  {
-+    use Config;
-+    $perl_threads = $Config{useithreads};
-+  }
- 
- 1;
- 
--- 
-1.8.0.2
-
diff --git a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch
deleted file mode 100644
index 79b81e6fa407..000000000000
--- a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/t/primary-prefix-invalid-couples.tap
-+++ b/t/primary-prefix-invalid-couples.tap
-@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1
- # Check that the same failures are present without the '--add-missing'
- # option.
- mv stderr stderr.old
-+cat stderr.old | sort > a
- AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
-+cat stderr | sort > b
- command_ok_ "... and with the same diagnostic of 'automake -a'" \
--            diff stderr.old stderr
-+            diff a b
- 
- :
diff --git a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
deleted file mode 100644
index 679370686aaf..000000000000
--- a/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Sat, 15 Aug 2015 04:40:57 -0400
-Subject: install-sh: avoid (low risk) race in /tmp
-
-Ensure that nobody can cross privilege boundaries by pre-creating
-symlink on '$tmpdir' path.
-
-Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not
-safe because '/tmp' directory is usually world-writeable and
-'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by
-attacker (at least for shells where $RANDOM is not supported).
-So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p.
-This step would fail early if somebody wanted catch us.
-
-Note that systems that implement (and have enabled)
-fs.protected_symlinks kernel feature are not affected even without
-this commit.
-
-References:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455
-https://bugzilla.redhat.com/show_bug.cgi?id=1140725
-
-* lib/install-sh: Implement safer 'mkdir -p' test by running
-'$mkdirprog $mkdir_mode "$tmpdir"' first.
-(scriptversion): Bump.
-
---- a/lib/install-sh
-+++ b/lib/install-sh
-@@ -345,34 +345,41 @@ do
- 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- 	    ;;
- 	  *)
-+	    # $RANDOM is not portable (e.g. dash);  use it when possible to
-+	    # lower collision chance
- 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
--	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+	    trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
- 
-+	    # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
-+	    # create the $tmpdir first (and fail if unsuccessful) to make sure
-+	    # that nobody tries to guess the $tmpdir name.
- 	    if (umask $mkdir_umask &&
--		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+		$mkdirprog $mkdir_mode "$tmpdir" &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
- 	    then
- 	      if test -z "$dir_arg" || {
- 		   # Check for POSIX incompatibilities with -m.
- 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- 		   # other-writable bit of parent directory when it shouldn't.
- 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
--		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   test_tmpdir="$tmpdir/a"
-+		   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
- 		   case $ls_ld_tmpdir in
- 		     d????-?r-*) different_mode=700;;
- 		     d????-?--*) different_mode=755;;
- 		     *) false;;
- 		   esac &&
--		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
--		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
- 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- 		   }
- 		 }
- 	      then posix_mkdir=:
- 	      fi
--	      rmdir "$tmpdir/d" "$tmpdir"
-+	      rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
- 	    else
- 	      # Remove any dirs left behind by ancient mkdir implementations.
--	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	      rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
- 	    fi
- 	    trap '' 0;;
- 	esac;;
diff --git a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch b/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch
deleted file mode 100644
index 1fabdd5fb3e1..000000000000
--- a/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Sat, 15 Aug 2015 04:40:57 -0400
-Subject: install-sh: avoid (low risk) race in /tmp
-
-Ensure that nobody can cross privilege boundaries by pre-creating
-symlink on '$tmpdir' path.
-
-Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not
-safe because '/tmp' directory is usually world-writeable and
-'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by
-attacker (at least for shells where $RANDOM is not supported).
-So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p.
-This step would fail early if somebody wanted catch us.
-
-Note that systems that implement (and have enabled)
-fs.protected_symlinks kernel feature are not affected even without
-this commit.
-
-References:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455
-https://bugzilla.redhat.com/show_bug.cgi?id=1140725
-
-* lib/install-sh: Implement safer 'mkdir -p' test by running
-'$mkdirprog $mkdir_mode "$tmpdir"' first.
-(scriptversion): Bump.
----
- lib/install-sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/lib/install-sh b/lib/install-sh
-index 0b0fdcb..59990a1 100755
---- a/lib/install-sh
-+++ b/lib/install-sh
-@@ -324,34 +324,41 @@ do
-             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-             ;;
-           *)
-+            # $RANDOM is not portable (e.g. dash);  use it when possible to
-+            # lower collision chance
-             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
--            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
- 
-+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
-+            # create the $tmpdir first (and fail if unsuccessful) to make sure
-+            # that nobody tries to guess the $tmpdir name.
-             if (umask $mkdir_umask &&
--                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+                $mkdirprog $mkdir_mode "$tmpdir" &&
-+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-             then
-               if test -z "$dir_arg" || {
-                    # Check for POSIX incompatibilities with -m.
-                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                    # other-writable bit of parent directory when it shouldn't.
-                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
--                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+                   test_tmpdir="$tmpdir/a"
-+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                    case $ls_ld_tmpdir in
-                      d????-?r-*) different_mode=700;;
-                      d????-?--*) different_mode=755;;
-                      *) false;;
-                    esac &&
--                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
--                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                    }
-                  }
-               then posix_mkdir=:
-               fi
--              rmdir "$tmpdir/d" "$tmpdir"
-+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-             else
-               # Remove any dirs left behind by ancient mkdir implementations.
--              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-             fi
-             trap '' 0;;
-         esac;;
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index f452620758c5..ef04ccd4ce95 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 0439c88394d1..74e78358870c 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,7 +1,9 @@
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
 DIST libxfce4util-4.17.4.tar.bz2 511520 BLAKE2B 7850dbf49b5624ce8ac97c4188a80afc51f1d258b9760ff3ef7055cedb7dda11c18a784f053c4c25f9622e3db65d97f21ff9974fd9830edf696a81543453f982 SHA512 9774f199cd54c28875801e74e76f6e000579f3cc15e65c72e2edc6723b3a1b93083e9dd2ce0bd37885f4d812c3223552b6caa723ab8ce5169c69ccff8d2f6eb8
 DIST libxfce4util-4.18.0.tar.bz2 511384 BLAKE2B 65db083fb2ecec007f2f1052afad58184a8e607e2959c49e313a87781f92e8b76d1b59daeb1c6b159cfc000ba37edf25aab1df96526ce5aa7c218dc27a896447 SHA512 10ec7798570c95719951fdd6cbd45aefc6950e6012b17f05f9023711a874dbaf79ac5c07d98990f7c5bf9efb1d254732f203f670f23bf23a2004656f46737749
+DIST libxfce4util-4.18.1.tar.bz2 527167 BLAKE2B b5d16b4e6ce541a7de559eb2801cf800dab26c45e83b0c562974f18218fd9ad0d70e40219b573a90f1ea1b9e15a8111cfae6200f581335f305a7e7f6eb07adc9 SHA512 e1459e2268948c8329394bdca56f7e7bef7739b56559c00ce6d70dfbedd038cd73a4873be34b91dbd94a80afc16e2b0e1cc256d3ff4d8fdeef9162fbdb3772cd
 EBUILD libxfce4util-4.16.0.ebuild 1094 BLAKE2B 5c6da62a80dd1d3d2aaa77b771eea7b3c372d1b60ac1585cd6b40c6c0b36a176ea697522cc9bbbc179d566985b23156497a765871962f3a8dfe14f2e0eabc1d6 SHA512 8ddb4aff9b6c055e2defcb8375a7434db9ca0129ffc9590d937f2d2213f808e8e7ac21a9542888058108c0e237b6e23998de8426b5229549be8eeeffdb80f646
 EBUILD libxfce4util-4.17.4.ebuild 1056 BLAKE2B 034def2d188f4c372f961153a1f85892a7e7949181fed62ccf657bf1faa89dab92d2ad0757ded89a594b6f1f25c0e45ef0b9c50a4c5579f357aeffd3e409ccb7 SHA512 ed0f8c9475e597b60a2a2f2913ab6de100c1c9c6035529a2c0e48f512b76626ec3a2fb648a07eaa607fe556a2faccbd08addd93d72c2255619c52241a7a58129
 EBUILD libxfce4util-4.18.0.ebuild 1061 BLAKE2B 4950dd5229e5e12040e017e93316765a9126aad23bbaf12e0efd57adcd49f20cf31aa8fadd060ed38e00606724d2d3bb8f57e121d47cb8cd71c6ea61c289c084 SHA512 3d347a7b5190cad217225edd6d815f9cf3c72948e7046a1c83018565121b3a973812b623f3ccfebf4faec03144d7c89a95e92bb9f41a15c2606cbf7714e9d966
+EBUILD libxfce4util-4.18.1.ebuild 1061 BLAKE2B 39ac82b27dc8167e4cd343d7461288f163e1cffe4b66c88840a870855b2d98c94ffabd473732145f8e4f8edb38cf16e6cc6fcd280bb4d1c4bdb119ea2f21f7db SHA512 540073b22dc8a6bddc3e53e3acca1cb060217aa8c78200bf25e5c9276b179d4ebb4420e179192526b728beb8959b681aa4a2010db5356fefc5a29daf0436364f
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
new file mode 100644
index 000000000000..e69e52005cf5
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4util/start
+	https://gitlab.xfce.org/xfce/libxfce4util/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/libxfce4windowing/Manifest b/xfce-base/libxfce4windowing/Manifest
index 0d731048ccbd..e06145c5977b 100644
--- a/xfce-base/libxfce4windowing/Manifest
+++ b/xfce-base/libxfce4windowing/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4windowing-4.19.0.tar.bz2 442774 BLAKE2B 8d0a64d07d1535f74d3767c47d2513b481502a8d2b259572fb22d25cb3ab07409c00014922ebe5222c2637792e57d2edfb94e7a028965ea076be52e098a8ed0e SHA512 c1dbbf243158239c96f2d3db4fb556dca72db7c885b6288653e45fa74cb22b5af2a997a7c7ac1ead203078de958a6dbec77a86826c867156266c341384e97f9d
 DIST libxfce4windowing-4.19.1.tar.bz2 452748 BLAKE2B 0fbf8ec5bb1d1857dfbe2851ef25a63dca57315c9f9dd5e3d870ae86c5fa054e3f4915d7cef1c98a5ac909ff29e8ad47b5b2754d1c8b2199320ee4a5efcf2eae SHA512 4666ff3a0142f584fb62cff8e6271a73bc3da8f1cd6dad629e3075a5a2552f54d56abb44bc6d9b2c1b4a1c8ed131bd6aa875714191cffd28958a2edf09a90729
-EBUILD libxfce4windowing-4.19.0.ebuild 1145 BLAKE2B be494b7201a0cabded9908e8d2e3a9ec5c6852377e10667591e84aba6048a591e6020876e86d4861ec2b8deec1f68223fad0f2a745d6a5fa51256a256130ebac SHA512 8ac9e31de0941cd255dd49d465181a8698d2f1213f58f3d8c0236d2d944f68baba0e383f210ec20952c64cc099852d732ff15336d23866a068580048c58f4086
-EBUILD libxfce4windowing-4.19.1.ebuild 1145 BLAKE2B 805eb06f0b39867989a4772cab82cf0bcf04d30acab12dbb685e2792c17edb3f288070a390e3fa73d6a9f1722bd47c6f5b302b4bf20c6fe5a60078a93fa6d1dc SHA512 f29e49d29c47a80a5b28223213f4c6fb2240bfe1ea8128c111f68be6d6ba5d8635cd339868fda75ceac3c591a6995435360cacd11e8cc521e310ac30b02bc58c
+EBUILD libxfce4windowing-4.19.1.ebuild 1091 BLAKE2B 21c7397b2be3200ee0a9e87b399655804b81ecd73f628c0d7adde6a03d55b7d27f492604f5436256f66b9b7946e2f2bf89266d054c846daf9bfc26fdb24f96a5 SHA512 7783c6eccac00e1b14e3facde5852a7c4583fdc869be00ec1821c48ceb12673b585f2ecd839f038c1c57699e3b9d60508e18af12a9d02352ff843b1b0f6af278
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.0.ebuild b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.0.ebuild
deleted file mode 100644
index ad27afe2483e..000000000000
--- a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://gitlab.xfce.org/xfce/libxfce4windowing/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+introspection wayland X"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	>=x11-libs/gdk-pixbuf-2.40.0[introspection?]
-	wayland? (
-		>=x11-libs/gtk+-3.24.0:3[wayland]
-		>=dev-libs/wayland-1.15
-	)
-	X? (
-		>=x11-libs/gtk+-3.24.0:3[X]
-		>=x11-libs/libwnck-3.14:3
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	wayland? (
-		>=dev-util/wayland-scanner-1.15
-	)
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable wayland gdk-wayland)
-		$(use_enable wayland wayland-scanner)
-		$(use_enable wayland wayland-client)
-		$(use_enable X libwnck)
-		$(use_enable X gdk-x11)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
index 18933d2987ad..2b02ffb55a17 100644
--- a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
+++ b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
@@ -16,14 +16,12 @@ IUSE="+introspection wayland X"
 
 DEPEND="
 	>=dev-libs/glib-2.68.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	>=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?]
 	>=x11-libs/gdk-pixbuf-2.40.0[introspection?]
 	wayland? (
-		>=x11-libs/gtk+-3.24.0:3[wayland]
 		>=dev-libs/wayland-1.15
 	)
 	X? (
-		>=x11-libs/gtk+-3.24.0:3[X]
 		>=x11-libs/libwnck-3.14:3
 	)
 "
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index ab1e7155a3e3..47141cfd7eb5 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,11 @@
 DIST xfce4-panel-4.16.5.tar.bz2 1386556 BLAKE2B e0543e2c2259a03b09ddaef951434127a76f176626b5355497c1f27748c83857cb34ed1ddecf694c36e3422ca9e55fa4e7eae728b0b50e06feb40ca6e867ebdc SHA512 d72220fa2812ae3b420350dab4c9d33e01d26d27ba33e4c16ad848ed1915c3c4aaf41fef24e2e7271e31171536148ad32b55aabc3e1facd4bf8a411990fd27bb
-DIST xfce4-panel-4.17.5.tar.bz2 1450044 BLAKE2B 5ee351df3ff56d82cd85c9bd4af85dc1fd2f597f4669167421f0af18255bb175ecb80fcc9ddae884d2e32184bb608833e22fe126a59cc48a03e8856520a3672e SHA512 149d41c190d2caf8e5f03ad8c2d53890b3529e21e31d34795673e4951c68ce6d96ca75a32d622ae211657f9ff1449cfffd5daa59cdc54bf4ff1b189f0cd7abfc
+DIST xfce4-panel-4.16.6.tar.bz2 1390083 BLAKE2B 8f55f4a24f9130f4ed0cc0b77161218ca1bd6dcd6e23c047e5e38c7dc3ef3a158a6b1538732c8c39143e3886e6994c103e81d26cda0ac2442ecb24872179f513 SHA512 7c1236e552de88e6dd831a9f5b567a743ac52b4f62a1c006cece31d162319d9402d7449657f54c70bf4dc09615dbfacf7320ddd22c57c14b54e3623f8903190f
 DIST xfce4-panel-4.18.0.tar.bz2 1451719 BLAKE2B 9a96c146b5d2764f3e5540979df7eecbe861c9527dfbb924643fc3335bf5f2648d760362024969b7d9d4005eec83805378d104bf5995e85afb9b2498946c47f0 SHA512 4269714fb4cd6fb915789f288a0464c7ceb8c0bca73040416f9f10b6c5ed936e0340b11da8bf7e662b5a1453764e360866abf0320a46e30d536603a329d9e727
+DIST xfce4-panel-4.18.1.tar.bz2 1446504 BLAKE2B b7b8c0d26d21a543af7bb05b66e4435cbb059043502f34bed27915eaf2684b324e9e9ca8407d666bf2258fb80e559e9b11e87ffea4067c9dc6a42737bc1345a4 SHA512 6c79b305676fc6f8088f5579352be1379e87cf88b4207be0c579e6ebc9661a76f8decc434ef9973e29ca363bb7a4caf980c41b1800fae7d55f47c0405dd48075
+DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
 EBUILD xfce4-panel-4.16.5.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
-EBUILD xfce4-panel-4.17.5.ebuild 1588 BLAKE2B bf550388daf75809fc6f07bb415dda9a12f86193fb60787e9a5cb7ad8b77c4c881a8a6e6eb7f17698e5fe4693d16df1c1e847c86c7b253b3d0d22873861e279a SHA512 ef98679f7f87f95f34d371181efecde2af736bcc77c380b74ddab7b51016601a1f5764c394a59751b409a091f130b1bb75b9e3ee16e6776e67cbc6b7256ed4e4
+EBUILD xfce4-panel-4.16.6.ebuild 1511 BLAKE2B f3e24b8299e0e84c1553445c8b825058cb44923286befac2b5520df5c81b3acfabc418f116820caff0df2301ce64c79cc67eb77113e070157da1bfa7a81fd39b SHA512 106664e1351aefcc902717c0b60fcd090bfb65b791dbd9e8e12fc3326002a0444ee4baed03a141187567741ab859901e8adad7f676a1fee3aaffd1d2f6926210
 EBUILD xfce4-panel-4.18.0.ebuild 1596 BLAKE2B 6c2a566c4e4725f05d56fd15e6fdf13899b56f465f6d2430a2fd5efd7d904240027b8385dfbe93445e68a4a541adf987f23c95ee731fa773b4c56955b3691f7c SHA512 a6f20cd9f93f89265d41f512e22868390009e0cd636dd0c6736177b2382c9ad9d0b931dce571d742a72aefdea9437119b3dc139a113bc437044c29a449d13164
+EBUILD xfce4-panel-4.18.1.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
+EBUILD xfce4-panel-4.19.0.ebuild 1764 BLAKE2B baf2741b8d0e132d1c9e49c07e13ad56ece286c2fa421ed382c88f995707a9aceb118207639d90bc27526a6eaabd1b8d2330731d23261c84bc9f09e85cb00a0a SHA512 44fef2c55d030f9fbdbb6f32cb16bb9a580ca114fc1ec1b1098d56296a8daf8c53f12cc66db6f0aebf20b69eede23d32f780dba25062d0775c320be770bb464e
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild
new file mode 100644
index 000000000000..954affe6d4ed
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbusmenu introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.50
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libwnck:3
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-0.5:=
+	>=xfce-base/libxfce4ui-4.15.8:=
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.13:=
+	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable dbusmenu dbusmenu-gtk3)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.17.5.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
index b9c27f5159e3..7d772282a7b2 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.17.5.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,10 +18,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-RDEPEND="
-	>=dev-libs/glib-2.66
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
 	x11-libs/libX11
 	x11-libs/libwnck:3
 	>=xfce-base/exo-0.11.2:=
@@ -32,8 +32,8 @@ RDEPEND="
 	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
 	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
 "
 BDEPEND="
 	vala? ( $(vala_depend) )
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
new file mode 100644
index 000000000000..fff8efcd9fa6
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-panel/start
+	https://gitlab.xfce.org/xfce/xfce4-panel/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X +dbusmenu introspection vala wayland"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.72.0
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?]
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-4.17.0:=
+	>=xfce-base/libxfce4ui-4.17.1:=
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/libxfce4windowing-4.19.1:=
+	>=xfce-base/xfconf-4.13:=
+	X? (
+		x11-libs/libX11
+		x11-libs/libwnck:3
+	)
+	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=gui-libs/gtk-layer-shell-0.7.0
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable dbusmenu dbusmenu-gtk3)
+		$(use_enable vala)
+		$(use_enable X gtk-x11)
+		$(use_enable X libwnck)
+		$(use_enable wayland wayland-client)
+		$(use_enable wayland gtk-layer-shell)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-01-10 23:43:04 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-10 23:43:04 +0000
commit	113cc6fe7a9adc2baf67f9ef7723db6ed2b24887 (patch)
tree	968fd44d403c54949106d2c90a128f529f7ef3d0
parent	1fe49f5b3e13481832866b6b1600741bf3a1f024 (diff)